diff --git a/src/main/java/hudson/plugins/jira/JiraSession.java b/src/main/java/hudson/plugins/jira/JiraSession.java index 1f339466..28367d80 100644 --- a/src/main/java/hudson/plugins/jira/JiraSession.java +++ b/src/main/java/hudson/plugins/jira/JiraSession.java @@ -39,6 +39,8 @@ public class JiraSession { private static final Logger LOGGER = Logger.getLogger(JiraSession.class.getName()); + public static final Integer MAX_ISSUES = 100; + public final JiraRestService service; /** @@ -129,7 +131,7 @@ public Issue getIssue(String id) { * @return issues matching the JQL query */ public List getIssuesFromJqlSearch(final String jqlSearch) throws TimeoutException { - return service.getIssuesFromJqlSearch(jqlSearch, 100); + return service.getIssuesFromJqlSearch(jqlSearch, MAX_ISSUES); } /** @@ -173,10 +175,11 @@ public List 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), 100); + String.format("project = \"%s\" and fixVersion = \"%s\" and " + filter, projectKey, version), + MAX_ISSUES); } return service.getIssuesFromJqlSearch( - String.format("project = \"%s\" and fixVersion = \"%s\"", projectKey, version), 100); + String.format("project = \"%s\" and fixVersion = \"%s\"", projectKey, version), MAX_ISSUES); } /** @@ -223,7 +226,7 @@ public void migrateIssuesToFixVersion(String projectKey, String version, String } LOGGER.fine("Fetching versions with JQL:" + query); - List issues = service.getIssuesFromJqlSearch(query, Integer.MAX_VALUE); + List issues = service.getIssuesFromJqlSearch(query, MAX_ISSUES); if (issues == null || issues.isEmpty()) { return; } @@ -253,7 +256,7 @@ public void replaceFixVersion(String projectKey, String fromVersion, String toVe } LOGGER.fine("Fetching versions with JQL:" + query); - List issues = service.getIssuesFromJqlSearch(query, Integer.MAX_VALUE); + List issues = service.getIssuesFromJqlSearch(query, MAX_ISSUES); if (issues == null) { return; } @@ -306,7 +309,7 @@ public void addFixVersion(String projectKey, String version, String query) throw } LOGGER.fine("Fetching issues with JQL:" + query); - List issues = service.getIssuesFromJqlSearch(query, Integer.MAX_VALUE); + List issues = service.getIssuesFromJqlSearch(query, MAX_ISSUES); if (issues == null || issues.isEmpty()) { return; } diff --git a/src/test/java/JiraTester.java b/src/test/java/JiraTester.java index 7f937ec9..7afb65ea 100644 --- a/src/test/java/JiraTester.java +++ b/src/test/java/JiraTester.java @@ -1,5 +1,3 @@ -import static hudson.plugins.jira.JiraSite.ExtendedAsynchronousJiraRestClientFactory; - import com.atlassian.jira.rest.client.api.domain.Component; import com.atlassian.jira.rest.client.api.domain.Issue; import com.atlassian.jira.rest.client.api.domain.IssueType; @@ -7,7 +5,9 @@ import com.atlassian.jira.rest.client.api.domain.Transition; import com.atlassian.jira.rest.client.api.domain.User; import hudson.plugins.jira.JiraRestService; +import hudson.plugins.jira.JiraSession; import hudson.plugins.jira.JiraSite; +import hudson.plugins.jira.JiraSite.ExtendedAsynchronousJiraRestClientFactory; import hudson.plugins.jira.extension.ExtendedJiraRestClient; import hudson.plugins.jira.extension.ExtendedVersion; import java.net.URI; @@ -103,7 +103,7 @@ public static void main(String[] args) throws Exception { private static void callUniq(final JiraRestService restService) throws Exception { long start = System.currentTimeMillis(); List issues = - restService.getIssuesFromJqlSearch("key in ('JENKINS-53320','JENKINS-51057')", Integer.MAX_VALUE); + restService.getIssuesFromJqlSearch("key in ('JENKINS-53320','JENKINS-51057')", JiraSession.MAX_ISSUES); long end = System.currentTimeMillis(); System.out.println("time uniq " + (end - start)); } @@ -112,7 +112,7 @@ private static void callDuplicate(final JiraRestService restService) throws Exce long start = System.currentTimeMillis(); List issues = restService.getIssuesFromJqlSearch( "key in ('JENKINS-53320','JENKINS-53320','JENKINS-53320','JENKINS-53320','JENKINS-53320','JENKINS-51057','JENKINS-51057','JENKINS-51057','JENKINS-51057','JENKINS-51057')", - Integer.MAX_VALUE); + JiraSession.MAX_ISSUES); long end = System.currentTimeMillis(); System.out.println("time duplicate " + (end - start)); } diff --git a/src/test/java/JiraTesterBearerAuth.java b/src/test/java/JiraTesterBearerAuth.java index 6c58014b..bf1f3bbf 100644 --- a/src/test/java/JiraTesterBearerAuth.java +++ b/src/test/java/JiraTesterBearerAuth.java @@ -1,5 +1,3 @@ -import static hudson.plugins.jira.JiraSite.ExtendedAsynchronousJiraRestClientFactory; - import com.atlassian.jira.rest.client.api.domain.Component; import com.atlassian.jira.rest.client.api.domain.Issue; import com.atlassian.jira.rest.client.api.domain.IssueType; @@ -7,7 +5,9 @@ import com.atlassian.jira.rest.client.api.domain.Transition; import com.atlassian.jira.rest.client.api.domain.User; import hudson.plugins.jira.JiraRestService; +import hudson.plugins.jira.JiraSession; import hudson.plugins.jira.JiraSite; +import hudson.plugins.jira.JiraSite.ExtendedAsynchronousJiraRestClientFactory; import hudson.plugins.jira.auth.BearerHttpAuthenticationHandler; import hudson.plugins.jira.extension.ExtendedJiraRestClient; import hudson.plugins.jira.extension.ExtendedVersion; @@ -105,7 +105,7 @@ public static void main(String[] args) throws Exception { private static void callUniq(final JiraRestService restService) throws Exception { long start = System.currentTimeMillis(); List issues = - restService.getIssuesFromJqlSearch("key in ('JENKINS-53320','JENKINS-51057')", Integer.MAX_VALUE); + restService.getIssuesFromJqlSearch("key in ('JENKINS-53320','JENKINS-51057')", JiraSession.MAX_ISSUES); long end = System.currentTimeMillis(); System.out.println("time uniq " + (end - start)); } @@ -114,7 +114,7 @@ private static void callDuplicate(final JiraRestService restService) throws Exce long start = System.currentTimeMillis(); List issues = restService.getIssuesFromJqlSearch( "key in ('JENKINS-53320','JENKINS-53320','JENKINS-53320','JENKINS-53320','JENKINS-53320','JENKINS-51057','JENKINS-51057','JENKINS-51057','JENKINS-51057','JENKINS-51057')", - Integer.MAX_VALUE); + JiraSession.MAX_ISSUES); long end = System.currentTimeMillis(); System.out.println("time duplicate " + (end - start)); } diff --git a/src/test/java/hudson/plugins/jira/JiraReplaceFixVersionByRegExTest.java b/src/test/java/hudson/plugins/jira/JiraReplaceFixVersionByRegExTest.java index f8a28a2f..bef59800 100644 --- a/src/test/java/hudson/plugins/jira/JiraReplaceFixVersionByRegExTest.java +++ b/src/test/java/hudson/plugins/jira/JiraReplaceFixVersionByRegExTest.java @@ -54,7 +54,7 @@ void replaceWithFixVersionByRegex() throws URISyntaxException, TimeoutException ArrayList issues = new ArrayList<>(); issues.add(getIssue("abcXXXXefg", 1L)); issues.add(getIssue("dgcXXXXefg", 2L)); - when(service.getIssuesFromJqlSearch(QUERY, Integer.MAX_VALUE)).thenReturn(issues); + when(service.getIssuesFromJqlSearch(QUERY, JiraSession.MAX_ISSUES)).thenReturn(issues); jiraSession.replaceFixVersion(PROJECT_KEY, "/abc.*efg/", TO_VERSION, QUERY);