Remove corresponding issues on branch delete

core/com.b2international.snowowl.core/src/com/b2international/snowowl/core/branch/BranchDeleteRequest.java

@@ -15,25 +15,44 @@
  */
 package com.b2international.snowowl.core.branch;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import com.b2international.commons.exceptions.NotFoundException;
 import com.b2international.index.revision.BaseRevisionBranching;
+import com.b2international.snowowl.core.TerminologyResource;
 import com.b2international.snowowl.core.authorization.AccessControl;
 import com.b2international.snowowl.core.domain.RepositoryContext;
 import com.b2international.snowowl.core.identity.Permission;
+import com.b2international.snowowl.core.repository.PathTerminologyResourceResolver;
 
 /**
  * @since 4.1
  */
 public final class BranchDeleteRequest extends BranchBaseRequest<Boolean> implements AccessControl {
 
+	private static final long serialVersionUID = 1L;
+	private static final Logger LOGGER = LoggerFactory.getLogger(BranchDeleteRequest.class);
+
 	public BranchDeleteRequest(final String branchPath) {
 		super(branchPath);
 	}
 
 	@Override
 	public Boolean execute(RepositoryContext context) {
 		try {
+			//Remove branch
 			context.service(BaseRevisionBranching.class).delete(getBranchPath());
+
+			try {
+				//Schedule a job to remove issues corresponding to this branch
+				TerminologyResource resource = context.service(PathTerminologyResourceResolver.class).resolve(context, context.info().id(), getBranchPath());
+				String resourceURI = resource.getResourceURI(getBranchPath()).toString();
+				context.service(ValidationCleanupService.class).scheduleStaleIssueRemoval(context, resourceURI);				
+			} catch (Exception e) {
+				LOGGER.trace(String.format("Failed to remove validation issues associated with deleted branch %s", getBranchPath()), e);
+			}
+
 		} catch (NotFoundException e) {
 			// ignore
 		}

core/com.b2international.snowowl.core/src/com/b2international/snowowl/core/branch/ValidationCleanupService.java

@@ -0,0 +1,79 @@
+package com.b2international.snowowl.core.branch;
+
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.core.runtime.jobs.ISchedulingRule;
+
+import com.b2international.commons.CompareUtils;
+import com.b2international.snowowl.core.ServiceProvider;
+import com.b2international.snowowl.core.events.AsyncRequest;
+import com.b2international.snowowl.core.identity.User;
+import com.b2international.snowowl.core.jobs.JobRequests;
+import com.b2international.snowowl.core.jobs.SerializableSchedulingRule;
+import com.b2international.snowowl.core.validation.ValidationRequests;
+import com.google.common.base.Joiner;
+
+public class ValidationCleanupService {
+
+	public static final SerializableSchedulingRule VALIDATION_ISSUE_CLEANUP_RULE = new SerializableSchedulingRule() {
+
+		private static final long serialVersionUID = 1L;
+
+		@Override
+		public boolean isConflicting(ISchedulingRule rule) {
+			return rule == this;
+		}
+
+		@Override
+		public boolean contains(ISchedulingRule rule) {
+			return rule == this;
+		}
+	};
+
+	public ValidationCleanupService() {
+	}
+
+	public void scheduleStaleIssueRemoval(ServiceProvider context, String resourceURI) {
+		scheduleStaleIssueRemoval(context, List.of(resourceURI), Collections.emptyList());
+	}
+
+	public void scheduleStaleIssueRemoval(ServiceProvider context, List<String> resourceURIs) {
+		scheduleStaleIssueRemoval(context, resourceURIs, Collections.emptyList());
+	}
+
+	public void scheduleStaleIssueRemoval(ServiceProvider context, String resourceURI, List<String> resultIds) {
+		scheduleStaleIssueRemoval(context, List.of(resourceURI), resultIds);
+	}
+
+	public void scheduleStaleIssueRemoval(ServiceProvider context, List<String> resourceURIs, List<String> resultIds) {
+		AsyncRequest<Boolean> request;
+
+		if (!CompareUtils.isEmpty(resultIds)) {
+			request = ValidationRequests.issues()
+					.prepareDelete()
+					.setResultIds(resultIds)
+					.buildAsync();
+		} else {
+			if (CompareUtils.isEmpty(resourceURIs)) {
+				return;
+			}
+
+			request = ValidationRequests.issues()
+				.prepareDelete()
+				.setCodeSystemURIs(resourceURIs)
+				.buildAsync();
+		}
+
+		final String description = String.format("Remove validation issues on stale/removed branch(es) of %s", Joiner.on(", ").join(resourceURIs));
+
+		JobRequests.prepareSchedule()
+			.setRequest(request)
+			.setDescription(description)
+			.setAutoClean(true)
+			.setSchedulingRule(VALIDATION_ISSUE_CLEANUP_RULE)
+			.build()
+			.execute(context);
+	}
+
+}

core/com.b2international.snowowl.core/src/com/b2international/snowowl/core/internal/validation/ValidationPlugin.java

@@ -31,6 +31,7 @@
 import com.b2international.index.mapping.Mappings;
 import com.b2international.index.query.Expressions;
 import com.b2international.index.query.Query;
+import com.b2international.snowowl.core.branch.ValidationCleanupService;
 import com.b2international.snowowl.core.config.IndexSettings;
 import com.b2international.snowowl.core.config.RepositoryConfiguration;
 import com.b2international.snowowl.core.config.SnowOwlConfiguration;
@@ -106,6 +107,7 @@ public void preRun(SnowOwlConfiguration configuration, Environment env) throws E
 			env.services().registerService(ValidationConfiguration.class, validationConfig);
 			env.services().registerService(ValidationThreadPool.class, new ValidationThreadPool(numberOfValidationThreads, maxConcurrentExpensiveJobs, maxConcurrentNormalJobs));
 			env.services().registerService(ValidationIssueDetailExtensionProvider.class, new ValidationIssueDetailExtensionProvider(env.service(ClassPathScanner.class)));
+			env.services().registerService(ValidationCleanupService.class, new ValidationCleanupService());
 
 			final List<File> listOfFiles = validationDirectories.stream().flatMap(path -> Arrays.asList(path.toFile().listFiles()).stream()).toList();
 			final Set<File> validationRuleFiles = Sets.newHashSet();