Switch to search/jql where applicable

https://developer.atlassian.com/changelog/#CHANGE-2046

Author: marko-bekhta

src/main/java/org/hibernate/infra/replicate/jira/service/jira/HandlerProjectContext.java

@@ -89,7 +89,7 @@ public Optional<JiraIssue> getNextIssueToSync(Long latestSyncedJiraIssueKeyNumbe
 			query = "project = %s ORDER BY key ASC".formatted(project.originalProjectKey(),
 					project.originalProjectKey());
 		}
-		JiraIssues issues = projectGroupContext.sourceJiraClient().find(query, 0, 1);
+		JiraIssues issues = projectGroupContext.sourceJiraClient().find(query, null, 1, List.of("key", "issuelinks"));
 		if (issues.issues.isEmpty()) {
 			return Optional.empty();
 		} else {

src/main/java/org/hibernate/infra/replicate/jira/service/jira/JiraService.java

@@ -331,16 +331,16 @@ private void syncByQuery(String query, HandlerProjectGroupContext context) {
 
 	private void syncByQuery(String query, HandlerProjectGroupContext context, Consumer<JiraIssue> action) {
 		JiraIssues issues = null;
-		int start = 0;
+		String nextPageToken = null;
 		int max = 100;
 		do {
-			issues = context.sourceJiraClient().find(query, start, max);
-			Log.infof("Sync by query \"%s\" will try syncing %s issues.",
-					query.substring(0, Math.min(100, query.length())), issues.total);
+			issues = context.sourceJiraClient().find(query, nextPageToken, max, List.of("*all"));
+			Log.infof("Sync by query \"%s\" will try syncing issues.",
+					query.substring(0, Math.min(100, query.length())));
 			issues.issues.forEach(action);
 
-			start += max;
-		} while (!issues.issues.isEmpty());
+			nextPageToken = issues.nextPageToken;
+		} while (!issues.isLast && nextPageToken != null);
 	}
 
 	private void triggerSyncEvent(JiraIssue jiraIssue, HandlerProjectGroupContext context) {

src/main/java/org/hibernate/infra/replicate/jira/service/jira/client/JiraRestClient.java

@@ -141,6 +141,23 @@ JiraIssueResponse update(@PathParam("issueKey") String issueKey, @PathParam("com
 	@Path("/issueLink/{linkId}")
 	void deleteIssueLink(@PathParam("linkId") String linkId);
 
+	/**
+	 * @param fields
+	 *            A list of fields to return for each issue, use it to retrieve a
+	 *            subset of fields. This parameter accepts a comma-separated list.
+	 *            Expand options include:
+	 *
+	 *            {@code *all} Returns all fields. id Returns only issue IDs. Any
+	 *            issue field, prefixed with a minus to exclude. The default is id.
+	 *
+	 *            Note: By default, this resource returns IDs only.
+	 */
+	@GET
+	@Path("/search/jql")
+	JiraIssues find(@QueryParam("jql") String query, @QueryParam("nextPageToken") String nextPageToken,
+			@QueryParam("maxResults") int maxResults, @QueryParam("fields") List<String> fields);
+
+	// for Jira Data center where there is no /search/jql option available
 	@GET
 	@Path("/search")
 	JiraIssues find(@QueryParam("jql") String query, @QueryParam("startAt") int startAt,

src/main/java/org/hibernate/infra/replicate/jira/service/jira/client/JiraRestClientBuilder.java

@@ -242,6 +242,11 @@ public void deleteIssueLink(String linkId) {
 			withRetry(() -> delegate.deleteIssueLink(linkId));
 		}
 
+		@Override
+		public JiraIssues find(String query, String nextPageToken, int maxResults, List<String> fields) {
+			return withRetry(() -> delegate.find(query, nextPageToken, maxResults, fields));
+		}
+
 		@Override
 		public JiraIssues find(String query, int startAt, int maxResults) {
 			return withRetry(() -> delegate.find(query, startAt, maxResults));

src/main/java/org/hibernate/infra/replicate/jira/service/jira/model/rest/JiraFields.java

@@ -47,8 +47,9 @@ public String toString() {
 	}
 
 	public static String formatSummary(String summary) {
-		// for some reason Jira server does not like ` in the summaries and can result in very helpful "access denied" error responses
-		return summary.replace( "`", "" );
+		// for some reason Jira server does not like ` in the summaries and can result
+		// in very helpful "access denied" error responses
+		return summary.replace("`", "");
 	}
 
 }

src/main/java/org/hibernate/infra/replicate/jira/service/jira/model/rest/JiraIssues.java

@@ -7,8 +7,7 @@
 public class JiraIssues extends JiraBaseObject {
 
 	public List<JiraIssue> issues;
-	public int startAt;
-	public int maxResults;
-	public int total;
+	public String nextPageToken;
+	public boolean isLast;
 
 }

src/test/java/org/hibernate/infra/replicate/jira/export/ExportProjectTest.java

@@ -106,7 +106,7 @@ void export() throws IOException {
 
 		CSVFormat csvFormat = CSVFormat.DEFAULT.builder().setHeader(headers.toArray(String[]::new)).build();
 
-		int start = 0;
+		String nextPageToken = null;
 		int max = 100; // this seems to be a limit on the jira side.. requesting more didn't work.
 
 		JiraIssues issues;
@@ -117,7 +117,7 @@ void export() throws IOException {
 				"target/jira-exported-project-%s-%s.csv".formatted(PROJECT_ID, LocalDate.now()));
 				final CSVPrinter printer = new CSVPrinter(fw, csvFormat)) {
 			do {
-				issues = source.find(query, start, max);
+				issues = source.find(query, nextPageToken, max, List.of("*all"));
 				for (JiraIssue issue : issues.issues) {
 					List<Object> row = new ArrayList<>();
 					row.add(issue.key);
@@ -142,8 +142,8 @@ void export() throws IOException {
 
 					printer.printRecord(row);
 				}
-				start += max;
-			} while (!issues.issues.isEmpty());
+				nextPageToken = issues.nextPageToken;
+			} while (!issues.isLast && nextPageToken != null);
 		}
 	}
 

src/test/java/org/hibernate/infra/replicate/jira/mock/SampleJiraRestClient.java

@@ -181,6 +181,13 @@ public void deleteIssueLink(String linkId) {
 		// do nothing
 	}
 
+	@Override
+	public JiraIssues find(String query, String nextPageToken, int maxResults, List<String> fields) {
+		JiraIssues issues = new JiraIssues();
+		issues.issues = List.of();
+		return issues;
+	}
+
 	@Override
 	public JiraIssues find(String query, int startAt, int maxResults) {
 		JiraIssues issues = new JiraIssues();