Skip to content

Commit 77bff04

Browse files
authored
fix remaining MAX_VALUE instances in the codebase
fixes #654 replaces #655
1 parent 92d247a commit 77bff04

File tree

4 files changed

+18
-15
lines changed

4 files changed

+18
-15
lines changed

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

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@
3939
public class JiraSession {
4040
private static final Logger LOGGER = Logger.getLogger(JiraSession.class.getName());
4141

42+
public static final Integer MAX_ISSUES = 100;
43+
4244
public final JiraRestService service;
4345

4446
/**
@@ -129,7 +131,7 @@ public Issue getIssue(String id) {
129131
* @return issues matching the JQL query
130132
*/
131133
public List<Issue> getIssuesFromJqlSearch(final String jqlSearch) throws TimeoutException {
132-
return service.getIssuesFromJqlSearch(jqlSearch, 100);
134+
return service.getIssuesFromJqlSearch(jqlSearch, MAX_ISSUES);
133135
}
134136

135137
/**
@@ -173,10 +175,11 @@ public List<Issue> getIssuesWithFixVersion(String projectKey, String version, St
173175
LOGGER.fine("Fetching versions from project: " + projectKey + " with fixVersion:" + version);
174176
if (isNotEmpty(filter)) {
175177
return service.getIssuesFromJqlSearch(
176-
String.format("project = \"%s\" and fixVersion = \"%s\" and " + filter, projectKey, version), 100);
178+
String.format("project = \"%s\" and fixVersion = \"%s\" and " + filter, projectKey, version),
179+
MAX_ISSUES);
177180
}
178181
return service.getIssuesFromJqlSearch(
179-
String.format("project = \"%s\" and fixVersion = \"%s\"", projectKey, version), 100);
182+
String.format("project = \"%s\" and fixVersion = \"%s\"", projectKey, version), MAX_ISSUES);
180183
}
181184

182185
/**
@@ -223,7 +226,7 @@ public void migrateIssuesToFixVersion(String projectKey, String version, String
223226
}
224227

225228
LOGGER.fine("Fetching versions with JQL:" + query);
226-
List<Issue> issues = service.getIssuesFromJqlSearch(query, Integer.MAX_VALUE);
229+
List<Issue> issues = service.getIssuesFromJqlSearch(query, MAX_ISSUES);
227230
if (issues == null || issues.isEmpty()) {
228231
return;
229232
}
@@ -253,7 +256,7 @@ public void replaceFixVersion(String projectKey, String fromVersion, String toVe
253256
}
254257

255258
LOGGER.fine("Fetching versions with JQL:" + query);
256-
List<Issue> issues = service.getIssuesFromJqlSearch(query, Integer.MAX_VALUE);
259+
List<Issue> issues = service.getIssuesFromJqlSearch(query, MAX_ISSUES);
257260
if (issues == null) {
258261
return;
259262
}
@@ -306,7 +309,7 @@ public void addFixVersion(String projectKey, String version, String query) throw
306309
}
307310

308311
LOGGER.fine("Fetching issues with JQL:" + query);
309-
List<Issue> issues = service.getIssuesFromJqlSearch(query, Integer.MAX_VALUE);
312+
List<Issue> issues = service.getIssuesFromJqlSearch(query, MAX_ISSUES);
310313
if (issues == null || issues.isEmpty()) {
311314
return;
312315
}

src/test/java/JiraTester.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
import static hudson.plugins.jira.JiraSite.ExtendedAsynchronousJiraRestClientFactory;
2-
31
import com.atlassian.jira.rest.client.api.domain.Component;
42
import com.atlassian.jira.rest.client.api.domain.Issue;
53
import com.atlassian.jira.rest.client.api.domain.IssueType;
64
import com.atlassian.jira.rest.client.api.domain.Status;
75
import com.atlassian.jira.rest.client.api.domain.Transition;
86
import com.atlassian.jira.rest.client.api.domain.User;
97
import hudson.plugins.jira.JiraRestService;
8+
import hudson.plugins.jira.JiraSession;
109
import hudson.plugins.jira.JiraSite;
10+
import hudson.plugins.jira.JiraSite.ExtendedAsynchronousJiraRestClientFactory;
1111
import hudson.plugins.jira.extension.ExtendedJiraRestClient;
1212
import hudson.plugins.jira.extension.ExtendedVersion;
1313
import java.net.URI;
@@ -103,7 +103,7 @@ public static void main(String[] args) throws Exception {
103103
private static void callUniq(final JiraRestService restService) throws Exception {
104104
long start = System.currentTimeMillis();
105105
List<Issue> issues =
106-
restService.getIssuesFromJqlSearch("key in ('JENKINS-53320','JENKINS-51057')", Integer.MAX_VALUE);
106+
restService.getIssuesFromJqlSearch("key in ('JENKINS-53320','JENKINS-51057')", JiraSession.MAX_ISSUES);
107107
long end = System.currentTimeMillis();
108108
System.out.println("time uniq " + (end - start));
109109
}
@@ -112,7 +112,7 @@ private static void callDuplicate(final JiraRestService restService) throws Exce
112112
long start = System.currentTimeMillis();
113113
List<Issue> issues = restService.getIssuesFromJqlSearch(
114114
"key in ('JENKINS-53320','JENKINS-53320','JENKINS-53320','JENKINS-53320','JENKINS-53320','JENKINS-51057','JENKINS-51057','JENKINS-51057','JENKINS-51057','JENKINS-51057')",
115-
Integer.MAX_VALUE);
115+
JiraSession.MAX_ISSUES);
116116
long end = System.currentTimeMillis();
117117
System.out.println("time duplicate " + (end - start));
118118
}

src/test/java/JiraTesterBearerAuth.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
import static hudson.plugins.jira.JiraSite.ExtendedAsynchronousJiraRestClientFactory;
2-
31
import com.atlassian.jira.rest.client.api.domain.Component;
42
import com.atlassian.jira.rest.client.api.domain.Issue;
53
import com.atlassian.jira.rest.client.api.domain.IssueType;
64
import com.atlassian.jira.rest.client.api.domain.Status;
75
import com.atlassian.jira.rest.client.api.domain.Transition;
86
import com.atlassian.jira.rest.client.api.domain.User;
97
import hudson.plugins.jira.JiraRestService;
8+
import hudson.plugins.jira.JiraSession;
109
import hudson.plugins.jira.JiraSite;
10+
import hudson.plugins.jira.JiraSite.ExtendedAsynchronousJiraRestClientFactory;
1111
import hudson.plugins.jira.auth.BearerHttpAuthenticationHandler;
1212
import hudson.plugins.jira.extension.ExtendedJiraRestClient;
1313
import hudson.plugins.jira.extension.ExtendedVersion;
@@ -105,7 +105,7 @@ public static void main(String[] args) throws Exception {
105105
private static void callUniq(final JiraRestService restService) throws Exception {
106106
long start = System.currentTimeMillis();
107107
List<Issue> issues =
108-
restService.getIssuesFromJqlSearch("key in ('JENKINS-53320','JENKINS-51057')", Integer.MAX_VALUE);
108+
restService.getIssuesFromJqlSearch("key in ('JENKINS-53320','JENKINS-51057')", JiraSession.MAX_ISSUES);
109109
long end = System.currentTimeMillis();
110110
System.out.println("time uniq " + (end - start));
111111
}
@@ -114,7 +114,7 @@ private static void callDuplicate(final JiraRestService restService) throws Exce
114114
long start = System.currentTimeMillis();
115115
List<Issue> issues = restService.getIssuesFromJqlSearch(
116116
"key in ('JENKINS-53320','JENKINS-53320','JENKINS-53320','JENKINS-53320','JENKINS-53320','JENKINS-51057','JENKINS-51057','JENKINS-51057','JENKINS-51057','JENKINS-51057')",
117-
Integer.MAX_VALUE);
117+
JiraSession.MAX_ISSUES);
118118
long end = System.currentTimeMillis();
119119
System.out.println("time duplicate " + (end - start));
120120
}

src/test/java/hudson/plugins/jira/JiraReplaceFixVersionByRegExTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ void replaceWithFixVersionByRegex() throws URISyntaxException, TimeoutException
5454
ArrayList<Issue> issues = new ArrayList<>();
5555
issues.add(getIssue("abcXXXXefg", 1L));
5656
issues.add(getIssue("dgcXXXXefg", 2L));
57-
when(service.getIssuesFromJqlSearch(QUERY, Integer.MAX_VALUE)).thenReturn(issues);
57+
when(service.getIssuesFromJqlSearch(QUERY, JiraSession.MAX_ISSUES)).thenReturn(issues);
5858

5959
jiraSession.replaceFixVersion(PROJECT_KEY, "/abc.*efg/", TO_VERSION, QUERY);
6060

0 commit comments

Comments
 (0)