IALERT-3912: fix issue links for Jira Cloud

api-channel-issue-tracker/build.gradle

@@ -2,6 +2,7 @@ ext.moduleName = 'com.blackduck.integration.alert.api-channel-issue-tracker'
 
 dependencies {
     api project(':api-channel')
+    api 'com.blackduck.integration:int-jira-common'
 
     implementation platform(project(':alert-platform'))
     implementation project(':alert-common')

api-channel-issue-tracker/src/main/java/com/blackduck/integration/alert/api/channel/issue/tracker/IssueTrackerChannel.java

@@ -42,7 +42,7 @@ public MessageResult distributeMessages(
     )
         throws AlertException {
 
-        IssueTrackerProcessor<T> processor = processorFactory.createProcessor(distributionDetails, jobExecutionId, notificationIds);
+        IssueTrackerMessageProcessor<T> processor = processorFactory.createProcessor(distributionDetails, jobExecutionId, notificationIds);
         IssueTrackerResponse<T> issueTrackerResponse = processor.processMessages(messages, jobName);
 
         return new MessageResult(issueTrackerResponse.getStatusMessage());

api-channel-issue-tracker/src/main/java/com/blackduck/integration/alert/api/channel/issue/tracker/IssueTrackerMessageProcessor.java

@@ -0,0 +1,19 @@
+/*
+ * blackduck-alert
+ *
+ * Copyright (c) 2025 Black Duck Software, Inc.
+ *
+ * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide.
+ */
+package com.blackduck.integration.alert.api.channel.issue.tracker;
+
+import java.io.Serializable;
+
+import com.blackduck.integration.alert.api.channel.issue.tracker.model.IssueTrackerResponse;
+import com.blackduck.integration.alert.api.common.model.exception.AlertException;
+import com.blackduck.integration.alert.api.processor.extract.model.ProviderMessageHolder;
+
+public interface IssueTrackerMessageProcessor<T extends Serializable> {
+
+    IssueTrackerResponse<T> processMessages(ProviderMessageHolder messages, String jobName) throws AlertException;
+}

api-channel-issue-tracker/src/main/java/com/blackduck/integration/alert/api/channel/issue/tracker/IssueTrackerProcessor.java

@@ -11,22 +11,23 @@
 import java.util.LinkedList;
 import java.util.List;
 
-import com.blackduck.integration.alert.api.channel.issue.tracker.send.IssueTrackerAsyncMessageSender;
 import com.blackduck.integration.alert.api.channel.issue.tracker.model.IssueTrackerModelHolder;
 import com.blackduck.integration.alert.api.channel.issue.tracker.model.IssueTrackerResponse;
+import com.blackduck.integration.alert.api.channel.issue.tracker.send.IssueTrackerAsyncMessageSender;
 import com.blackduck.integration.alert.api.common.model.exception.AlertException;
 import com.blackduck.integration.alert.api.processor.extract.model.ProviderMessageHolder;
 import com.blackduck.integration.alert.api.processor.extract.model.project.ProjectMessage;
 
-public class IssueTrackerProcessor<T extends Serializable> {
+public class IssueTrackerProcessor<T extends Serializable> implements IssueTrackerMessageProcessor<T> {
     private final IssueTrackerModelExtractor<T> modelExtractor;
-    private final IssueTrackerAsyncMessageSender<T> messageSender;
+    private final IssueTrackerAsyncMessageSender<IssueTrackerModelHolder<T>> messageSender;
 
-    public IssueTrackerProcessor(IssueTrackerModelExtractor<T> modelExtractor, IssueTrackerAsyncMessageSender<T> messageSender) {
+    public IssueTrackerProcessor(IssueTrackerModelExtractor<T> modelExtractor, IssueTrackerAsyncMessageSender<IssueTrackerModelHolder<T>> messageSender) {
         this.modelExtractor = modelExtractor;
         this.messageSender = messageSender;
     }
 
+    @Override
     public final IssueTrackerResponse<T> processMessages(ProviderMessageHolder messages, String jobName) throws AlertException {
         List<IssueTrackerModelHolder<T>> issueTrackerModels = new LinkedList<>();
         IssueTrackerModelHolder<T> simpleMessageHolder = modelExtractor.extractSimpleMessageIssueModels(messages.getSimpleMessages(), jobName);

api-channel-issue-tracker/src/main/java/com/blackduck/integration/alert/api/channel/issue/tracker/IssueTrackerProcessorFactory.java

@@ -15,6 +15,6 @@
 import com.blackduck.integration.alert.common.persistence.model.job.details.DistributionJobDetailsModel;
 
 public interface IssueTrackerProcessorFactory<D extends DistributionJobDetailsModel, T extends Serializable> {
-    IssueTrackerProcessor<T> createProcessor(D distributionDetails, UUID jobExecutionId, Set<Long> notificationIds) throws AlertException;
+    IssueTrackerMessageProcessor<T> createProcessor(D distributionDetails, UUID jobExecutionId, Set<Long> notificationIds) throws AlertException;
 
 }

api-channel-issue-tracker/src/main/java/com/blackduck/integration/alert/api/channel/issue/tracker/action/IssueTrackerTestAction.java

@@ -15,33 +15,33 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.blackduck.integration.alert.api.channel.issue.tracker.model.IssueBomComponentDetails;
+import com.blackduck.integration.alert.api.channel.issue.tracker.model.IssueCreationModel;
+import com.blackduck.integration.alert.api.channel.issue.tracker.model.IssueTrackerIssueResponseModel;
 import com.blackduck.integration.alert.api.channel.issue.tracker.model.IssueTrackerModelHolder;
+import com.blackduck.integration.alert.api.channel.issue.tracker.model.ProjectIssueModel;
 import com.blackduck.integration.alert.api.channel.issue.tracker.search.ExistingIssueDetails;
 import com.blackduck.integration.alert.api.channel.issue.tracker.search.enumeration.IssueCategory;
 import com.blackduck.integration.alert.api.channel.issue.tracker.search.enumeration.IssueStatus;
 import com.blackduck.integration.alert.api.channel.issue.tracker.send.IssueTrackerMessageSender;
 import com.blackduck.integration.alert.api.channel.issue.tracker.send.IssueTrackerMessageSenderFactory;
-import com.blackduck.integration.alert.api.channel.issue.tracker.model.IssueBomComponentDetails;
-import com.blackduck.integration.alert.api.channel.issue.tracker.model.IssueCreationModel;
-import com.blackduck.integration.alert.api.channel.issue.tracker.model.IssueTrackerIssueResponseModel;
-import com.blackduck.integration.alert.api.channel.issue.tracker.model.ProjectIssueModel;
 import com.blackduck.integration.alert.api.common.model.exception.AlertException;
+import com.blackduck.integration.alert.api.descriptor.model.IssueTrackerChannelKey;
+import com.blackduck.integration.alert.api.processor.extract.model.ProviderDetails;
 import com.blackduck.integration.alert.common.channel.DistributionChannelTestAction;
 import com.blackduck.integration.alert.common.channel.issuetracker.enumeration.IssueOperation;
 import com.blackduck.integration.alert.common.exception.AlertFieldException;
 import com.blackduck.integration.alert.common.message.model.LinkableItem;
 import com.blackduck.integration.alert.common.message.model.MessageResult;
 import com.blackduck.integration.alert.common.persistence.model.job.DistributionJobModel;
 import com.blackduck.integration.alert.common.persistence.model.job.details.DistributionJobDetailsModel;
-import com.blackduck.integration.alert.api.descriptor.model.IssueTrackerChannelKey;
-import com.blackduck.integration.alert.api.processor.extract.model.ProviderDetails;
 
 public abstract class IssueTrackerTestAction<D extends DistributionJobDetailsModel, T extends Serializable> extends DistributionChannelTestAction {
     private final Logger logger = LoggerFactory.getLogger(getClass());
 
-    private final IssueTrackerMessageSenderFactory<D, T> messageSenderFactory;
+    private final IssueTrackerMessageSenderFactory<D, T, IssueTrackerModelHolder<T>> messageSenderFactory;
 
-    protected IssueTrackerTestAction(IssueTrackerChannelKey issueTrackerChannelKey, IssueTrackerMessageSenderFactory<D, T> messageSenderFactory) {
+    protected IssueTrackerTestAction(IssueTrackerChannelKey issueTrackerChannelKey, IssueTrackerMessageSenderFactory<D, T, IssueTrackerModelHolder<T>> messageSenderFactory) {
         super(issueTrackerChannelKey);
         this.messageSenderFactory = messageSenderFactory;
     }

api-channel-issue-tracker/src/main/java/com/blackduck/integration/alert/api/channel/issue/tracker/model/IssueCommentModel.java

@@ -15,17 +15,37 @@
 
 import com.blackduck.integration.alert.api.channel.issue.tracker.search.ExistingIssueDetails;
 import com.blackduck.integration.alert.api.common.model.AlertSerializableModel;
+import com.blackduck.integration.jira.common.cloud.model.AtlassianDocumentFormatModel;
 
 public class IssueCommentModel<T extends Serializable> extends AlertSerializableModel {
     private final ExistingIssueDetails<T> existingIssueDetails;
     private final List<String> comments;
     @Nullable
     private final ProjectIssueModel source;
 
+    // Only used for Jira Cloud channel.
+    // the reason these Jira Cloud specific fields are here is because of the layers of abstraction prevent having a model specific for Jira cloud.
+    @Nullable
+    private final AtlassianDocumentFormatModel atlassianDocumentFormatCommentModel;
+    @Nullable
+    private final List<AtlassianDocumentFormatModel> additionalComments;
+
     public IssueCommentModel(ExistingIssueDetails<T> existingIssueDetails, List<String> comments, @Nullable ProjectIssueModel source) {
+        this(existingIssueDetails, comments, source, null, null);
+    }
+
+    public IssueCommentModel(
+        ExistingIssueDetails<T> existingIssueDetails,
+        List<String> comments,
+        @Nullable ProjectIssueModel source,
+        @Nullable AtlassianDocumentFormatModel atlassianDocumentFormatCommentModel,
+        @Nullable List<AtlassianDocumentFormatModel> additionalComments
+    ) {
         this.existingIssueDetails = existingIssueDetails;
         this.comments = comments;
         this.source = source;
+        this.atlassianDocumentFormatCommentModel = atlassianDocumentFormatCommentModel;
+        this.additionalComments = additionalComments;
     }
 
     public ExistingIssueDetails<T> getExistingIssueDetails() {
@@ -40,4 +60,12 @@ public Optional<ProjectIssueModel> getSource() {
         return Optional.ofNullable(source);
     }
 
+    public Optional<AtlassianDocumentFormatModel> getAtlassianDocumentFormatCommentModel() {
+        return Optional.ofNullable(atlassianDocumentFormatCommentModel);
+    }
+
+    public Optional<List<AtlassianDocumentFormatModel>> getAdditionalComments() {
+        return Optional.ofNullable(additionalComments);
+    }
+
 }

api-channel-issue-tracker/src/main/java/com/blackduck/integration/alert/api/channel/issue/tracker/model/IssueCreationModel.java

@@ -14,6 +14,7 @@
 
 import com.blackduck.integration.alert.api.common.model.AlertSerializableModel;
 import com.blackduck.integration.alert.common.message.model.LinkableItem;
+import com.blackduck.integration.jira.common.cloud.model.AtlassianDocumentFormatModel;
 
 public class IssueCreationModel extends AlertSerializableModel {
     private static final long serialVersionUID = -3568919050386494416L;
@@ -24,29 +25,67 @@ public class IssueCreationModel extends AlertSerializableModel {
 
     private final LinkableItem provider;
     private final ProjectIssueModel source;
+    // Only used for Jira Cloud channel.
+    // the reason these Jira Cloud specific fields are here is because of the layers of abstraction prevent having a model specific for Jira cloud.
+    private final AtlassianDocumentFormatModel atlassianDocumentFormatDescriptionModel;
+    private final List<AtlassianDocumentFormatModel> atlassianDocumentFormatCommentModel;
 
     public static IssueCreationModel simple(String title, String description, List<String> postCreateComments, LinkableItem provider) {
-        return new IssueCreationModel(title, description, postCreateComments, provider, null, null);
+        return new IssueCreationModel(title, description, postCreateComments, provider, null, null, null, null);
+    }
+
+    public static IssueCreationModel simple(
+        String title,
+        LinkableItem provider,
+        AtlassianDocumentFormatModel atlassianDocumentFormatDescriptionModel,
+        List<AtlassianDocumentFormatModel> atlassianDocumentFormatCommentModel
+    ) {
+        return new IssueCreationModel(title, "", List.of(), provider, null, null, atlassianDocumentFormatDescriptionModel, atlassianDocumentFormatCommentModel);
     }
 
     public static IssueCreationModel project(String title, String description, List<String> postCreateComments, ProjectIssueModel source, @Nullable String queryString) {
-        return new IssueCreationModel(title, description, postCreateComments, source.getProvider(), source, queryString);
+        return new IssueCreationModel(title, description, postCreateComments, source.getProvider(), source, queryString, null, null);
+    }
+
+    public static IssueCreationModel project(
+        String title,
+        String description,
+        List<String> postCreateComments,
+        ProjectIssueModel source,
+        AtlassianDocumentFormatModel atlassianDocumentFormatDescriptionModel,
+        List<AtlassianDocumentFormatModel> atlassianDocumentFormatCommentModel,
+        @Nullable String queryString
+    ) {
+        return new IssueCreationModel(
+            title,
+            description,
+            postCreateComments,
+            source.getProvider(),
+            source,
+            queryString,
+            atlassianDocumentFormatDescriptionModel,
+            atlassianDocumentFormatCommentModel
+        );
     }
 
-    private IssueCreationModel(
+    protected IssueCreationModel(
         String title,
         String description,
         List<String> postCreateComments,
         LinkableItem provider,
         @Nullable ProjectIssueModel source,
-        @Nullable String queryString
+        @Nullable String queryString,
+        @Nullable AtlassianDocumentFormatModel atlassianDocumentFormatDescriptionModel,
+        @Nullable List<AtlassianDocumentFormatModel> atlassianDocumentFormatCommentModel
     ) {
         this.title = title;
         this.description = description;
         this.postCreateComments = postCreateComments;
         this.provider = provider;
         this.source = source;
         this.queryString = queryString;
+        this.atlassianDocumentFormatDescriptionModel = atlassianDocumentFormatDescriptionModel;
+        this.atlassianDocumentFormatCommentModel = atlassianDocumentFormatCommentModel;
     }
 
     public Optional<String> getQueryString() {
@@ -73,4 +112,11 @@ public Optional<ProjectIssueModel> getSource() {
         return Optional.ofNullable(source);
     }
 
+    public Optional<AtlassianDocumentFormatModel> getAtlassianDocumentFormatDescriptionModel() {
+        return Optional.ofNullable(atlassianDocumentFormatDescriptionModel);
+    }
+
+    public Optional<List<AtlassianDocumentFormatModel>> getAtlassianDocumentFormatCommentModel() {
+        return Optional.ofNullable(atlassianDocumentFormatCommentModel);
+    }
 }

api-channel-issue-tracker/src/main/java/com/blackduck/integration/alert/api/channel/issue/tracker/model/IssueTrackerEventModel.java

@@ -0,0 +1,45 @@
+/*
+ * blackduck-alert
+ *
+ * Copyright (c) 2025 Black Duck Software, Inc.
+ *
+ * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide.
+ */
+package com.blackduck.integration.alert.api.channel.issue.tracker.model;
+
+import java.util.List;
+
+import com.blackduck.integration.alert.api.event.AlertEvent;
+
+public class IssueTrackerEventModel {
+    private final List<AlertEvent> creationEvents;
+    private final List<AlertEvent> commentEvents;
+    private final List<AlertEvent> transitionEvents;
+
+    public IssueTrackerEventModel(List<AlertEvent> creationEvents, List<AlertEvent> commentEvents, List<AlertEvent> transitionEvents) {
+        this.creationEvents = creationEvents;
+        this.commentEvents = commentEvents;
+        this.transitionEvents = transitionEvents;
+    }
+
+    public List<AlertEvent> getIssueCreationEvents() {
+        if (creationEvents == null) {
+            return List.of();
+        }
+        return creationEvents;
+    }
+
+    public List<AlertEvent> getIssueCommentEvents() {
+        if (commentEvents == null) {
+            return List.of();
+        }
+        return commentEvents;
+    }
+
+    public List<AlertEvent> getIssueTransitionEvents() {
+        if (transitionEvents == null) {
+            return List.of();
+        }
+        return transitionEvents;
+    }
+}

api-channel-issue-tracker/src/main/java/com/blackduck/integration/alert/api/channel/issue/tracker/model/IssueTrackerModelHolder.java

@@ -12,7 +12,8 @@
 
 import org.apache.commons.collections4.ListUtils;
 
-public class IssueTrackerModelHolder<T extends Serializable> {
+public class IssueTrackerModelHolder<T extends Serializable> implements Serializable {
+
     private final List<IssueCreationModel> issueCreationModels;
     private final List<IssueTransitionModel<T>> issueTransitionModels;
     private final List<IssueCommentModel<T>> issueCommentModels;
@@ -24,7 +25,11 @@ public static <T extends Serializable> IssueTrackerModelHolder<T> reduce(IssueTr
         return new IssueTrackerModelHolder<>(unifiedIssueCreationModels, unifiedIssueTransitionModels, unifiedIssueCommentModels);
     }
 
-    public IssueTrackerModelHolder(List<IssueCreationModel> issueCreationModels, List<IssueTransitionModel<T>> issueTransitionModels, List<IssueCommentModel<T>> issueCommentModels) {
+    public IssueTrackerModelHolder(
+        List<IssueCreationModel> issueCreationModels,
+        List<IssueTransitionModel<T>> issueTransitionModels,
+        List<IssueCommentModel<T>> issueCommentModels
+    ) {
         this.issueCreationModels = issueCreationModels;
         this.issueTransitionModels = issueTransitionModels;
         this.issueCommentModels = issueCommentModels;

api-channel-issue-tracker/src/main/java/com/blackduck/integration/alert/api/channel/issue/tracker/send/AsyncMessageSender.java

@@ -0,0 +1,14 @@
+/*
+ * blackduck-alert
+ *
+ * Copyright (c) 2025 Black Duck Software, Inc.
+ *
+ * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide.
+ */
+package com.blackduck.integration.alert.api.channel.issue.tracker.send;
+
+import java.util.List;
+
+public interface AsyncMessageSender<T> {
+    void sendAsyncMessages(List<T> issueTrackerMessages);
+}

api-channel-issue-tracker/src/main/java/com/blackduck/integration/alert/api/channel/issue/tracker/send/DefaultIssueTrackerEventGenerator.java

@@ -0,0 +1,47 @@
+/*
+ * blackduck-alert
+ *
+ * Copyright (c) 2025 Black Duck Software, Inc.
+ *
+ * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide.
+ */
+package com.blackduck.integration.alert.api.channel.issue.tracker.send;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.function.Function;
+
+import com.blackduck.integration.alert.api.channel.issue.tracker.model.IssueTrackerEventModel;
+import com.blackduck.integration.alert.api.channel.issue.tracker.model.IssueTrackerModelHolder;
+import com.blackduck.integration.alert.api.event.AlertEvent;
+
+public class DefaultIssueTrackerEventGenerator<T extends Serializable> implements IssueTrackerEventGenerator<IssueTrackerModelHolder<T>> {
+
+    private final IssueTrackerCreationEventGenerator issueCreateEventGenerator;
+    private final IssueTrackerTransitionEventGenerator<T> issueTrackerTransitionEventGenerator;
+    private final IssueTrackerCommentEventGenerator<T> issueTrackerCommentEventGenerator;
+
+    public DefaultIssueTrackerEventGenerator(
+        IssueTrackerCreationEventGenerator issueCreateEventGenerator,
+        IssueTrackerTransitionEventGenerator<T> issueTrackerTransitionEventGenerator,
+        IssueTrackerCommentEventGenerator<T> issueTrackerCommentEventGenerator
+    ) {
+        this.issueCreateEventGenerator = issueCreateEventGenerator;
+        this.issueTrackerTransitionEventGenerator = issueTrackerTransitionEventGenerator;
+        this.issueTrackerCommentEventGenerator = issueTrackerCommentEventGenerator;
+    }
+
+    @Override
+    public IssueTrackerEventModel generateEvents(IssueTrackerModelHolder<T> model) {
+        List<AlertEvent> creationEvents = createMessages(model.getIssueCreationModels(), issueCreateEventGenerator::generateEvent);
+        List<AlertEvent> transitionEvents = createMessages(model.getIssueTransitionModels(), issueTrackerTransitionEventGenerator::generateEvent);
+        List<AlertEvent> commentEvents = createMessages(model.getIssueCommentModels(), issueTrackerCommentEventGenerator::generateEvent);
+        return new IssueTrackerEventModel(creationEvents, transitionEvents, commentEvents);
+    }
+
+    private <U> List<AlertEvent> createMessages(List<U> messages, Function<U, AlertEvent> eventGenerator) {
+        return messages.stream()
+            .map(eventGenerator)
+            .toList();
+    }
+}