If initial issue update failed with assignee and response points to a problem with it: retry without

Author: marko-bekhta

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

@@ -139,6 +139,21 @@ public void registerManagementRoutes(@Observes ManagementInterface mi) {
 					}).schedule();
 			rc.end();
 		});
+		mi.router().get("/sync/issues/re-sync/:project/:issue").blockingHandler(rc -> {
+			// TODO: we can remove this one once we figure out why POST management does not
+			// work correctly...
+			String project = rc.pathParam("project");
+			String issue = rc.pathParam("issue");
+
+			HandlerProjectContext context = contextPerProject.get(project);
+
+			if (context == null) {
+				throw new IllegalArgumentException("Unknown project '%s'".formatted(project));
+			}
+
+			triggerSyncEvent(context.sourceJiraClient().getIssue(issue), context);
+			rc.end();
+		});
 		mi.router().post("/sync/issues/list").consumes(MediaType.APPLICATION_JSON).blockingHandler(rc -> {
 			// sync issues based on a list of issue-keys supplied in the JSON body:
 			JsonObject request = rc.body().asJsonObject();

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

@@ -122,8 +122,9 @@ private String sanitize(String header, String value) {
 		}
 	}
 
-	// TODO: remove it once we figure out how to correctly integrate smallrye fault-tolerance
-	//   (simply adding annotations on the REST interface does not work)
+	// TODO: remove it once we figure out how to correctly integrate smallrye
+	// fault-tolerance
+	// (simply adding annotations on the REST interface does not work)
 	private static class JiraRestClientWithRetry implements JiraRestClient {
 
 		private final JiraRestClient delegate;
@@ -155,7 +156,7 @@ public JiraIssueBulkResponse create(JiraIssueBulk bulk) {
 		@Override
 		public JiraIssueResponse update(String key, JiraIssue issue) {
 			// it might be that mapped user is wrong so we don't want to keep sending it
-			return withRetry( () -> delegate.update( key, issue ), 2 );
+			return withRetry(() -> delegate.update(key, issue), 2);
 		}
 
 		@Override
@@ -259,7 +260,7 @@ private void withRetry(Runnable runnable) {
 		}
 
 		private <T> T withRetry(Supplier<T> supplier) {
-			return withRetry( supplier, RETRIES );
+			return withRetry(supplier, RETRIES);
 		}
 
 		private <T> T withRetry(Supplier<T> supplier, int retries) {
@@ -303,6 +304,13 @@ private boolean shouldRetryOnException(Throwable throwable) {
 							exception.headers());
 					return true;
 				}
+				if (Response.Status.Family.CLIENT_ERROR.equals(Response.Status.Family.familyOf(exception.statusCode()))
+						&& exception.getMessage().contains("\"assignee\"")) {
+					// we probably were trying to assign to an inactive or incorrectly configured
+					// user and the request failed,
+					// no point in retrying that ...
+					return false;
+				}
 			}
 			return false;
 		}

src/main/java/org/hibernate/infra/replicate/jira/service/jira/handler/JiraIssueUpsertEventHandler.java

@@ -42,7 +42,19 @@ protected void doRun() {
 		context.createNextPlaceholderBatch(destinationKey);
 
 		try {
-			context.destinationJiraClient().update(destinationKey, issueToCreate(sourceIssue));
+			JiraIssue issue = issueToCreate(sourceIssue);
+			try {
+				context.destinationJiraClient().update(destinationKey, issue);
+			} catch (JiraRestException e) {
+				if (e.getMessage().contains("\"assignee\"")) {
+					failureCollector.warning(
+							"Unable to update issue %s with assignee, will try to update all but assignee field."
+									.formatted(sourceIssue.key),
+							e);
+					issue.fields.assignee = null;
+					context.destinationJiraClient().update(destinationKey, issue);
+				}
+			}
 			// remote "aka web" links cannot be added in the same request and are also not
 			// returned as part of the issue API.
 			// We "upsert" the remote link pointing to the "original/source" issue that