Merge pull request #102 from reportportal/EPMRPP-107247

EPMRPP-107247 || merge missed commits

Author: grabsefx

build.gradle

@@ -42,9 +42,9 @@ dependencies {
         implementation 'com.epam.reportportal:plugin-api'
         annotationProcessor 'com.epam.reportportal:plugin-api'
     } else {
-        implementation 'com.github.reportportal:commons-dao:9b8b695'
-        implementation 'com.github.reportportal:plugin-api:f59b724'
-        annotationProcessor 'com.github.reportportal:plugin-api:f59b724'
+        implementation 'com.github.reportportal:commons-dao:ae1f509'
+        implementation 'com.github.reportportal:plugin-api:e1786c4'
+        annotationProcessor 'com.github.reportportal:plugin-api:e1786c4'
     }
 
     implementation("org.apache.httpcomponents.client5:httpclient5:5.4.2") // supports gzip encoding

gradle.properties

@@ -1,4 +1,4 @@
-version=5.13.1
+version=5.13.5
 description=EPAM Report Portal. Cloud Jira plugin
 pluginId = JIRA Cloud
 

src/main/java/com/epam/reportportal/extension/jira/command/GetIssueCommand.java

@@ -82,7 +82,7 @@ private Ticket getTicket(String ticketId, IntegrationParams details) {
       issues = client.issueSearchApi().searchForIssuesUsingJql(jql, null, 50, "", null, null, null, null, null);
 
     } catch (Exception e) {
-      throw new ReportPortalException(ErrorType.BAD_REQUEST_ERROR, e.getMessage());
+      throw new ReportPortalException(ErrorType.BAD_REQUEST_ERROR);
     }
     if (CollectionUtils.isNotEmpty(issues.getIssues())) {
       return JIRATicketUtils.toTicket(issues.getIssues().getFirst(), CloudJiraProperties.URL.getParam(details)

src/main/java/com/epam/reportportal/extension/jira/command/GetIssueFieldsCommand.java

@@ -146,9 +146,11 @@ protected List<PostFormField> invokeCommand(Integration integration, Map<String,
             allowed.add(new AllowedValue(version.getId(), version.getName()));
           }
         }
-        if (fieldID.equalsIgnoreCase(PRIORITY_FIELD.getValue()) && issueField.getKey().equals(PRIORITY_FIELD.name())) {
-          allowed.add(new AllowedValue(issueField.getValue().getKey(), issueField.getValue().getName()));
-
+        if (fieldID.equalsIgnoreCase(PRIORITY_FIELD.getValue())) {
+          allowed = issueField.getValue().getAllowedValues().stream()
+              .map(value -> (JsonNode) new ObjectMapper().valueToTree(value))
+              .map(jn -> new AllowedValue(jn.get("id").asText(), jn.get("name").asText()))
+              .collect(Collectors.toList());
         }
         if (fieldID.equalsIgnoreCase(ISSUE_TYPE_FIELD.getValue())) {
           isRequired = true;

src/main/java/com/epam/reportportal/extension/jira/command/PostTicketCommand.java

@@ -183,14 +183,16 @@ protected Ticket invokeCommand(Integration integration, Map<String, Object> para
         linkIssues(client, issue, linkedIssue);
       }
 
-      return getTicket(issueKey, integration.getParams(), client)
-          .orElse(null);
+      return JIRATicketUtils.toTicket(issue,
+          CloudJiraProperties.URL.getParam(integration.getParams())
+              .orElseThrow(() -> new ReportPortalException(UNABLE_INTERACT_WITH_INTEGRATION,
+                  "Url is not specified.")));
 
     } catch (ReportPortalException e) {
       throw e;
     } catch (Exception e) {
       log.error(e.getMessage());
-      throw new ReportPortalException(UNABLE_INTERACT_WITH_INTEGRATION, e.getMessage());
+      throw new ReportPortalException(UNABLE_INTERACT_WITH_INTEGRATION);
     }
   }
 
@@ -224,21 +226,6 @@ private Map<String, String> findBinaryData(IssueUpdateDetails issueInput) {
     return binary;
   }
 
-  private Optional<Ticket> getTicket(String id, IntegrationParams details, JiraRestClient jiraRestClient) {
-    SearchResults issues = findIssue(id, jiraRestClient);
-    if (issues.getTotal() > 0) {
-      IssueBean issue = jiraRestClient.issuesApi().getIssue(id, null, false, null, null, false, false);
-      return Optional.of(JIRATicketUtils.toTicket(issue, CloudJiraProperties.URL.getParam(details)
-          .orElseThrow(() -> new ReportPortalException(UNABLE_INTERACT_WITH_INTEGRATION, "Url is not specified."))));
-    } else {
-      return Optional.empty();
-    }
-  }
-
-  private SearchResults findIssue(String id, JiraRestClient jiraRestClient) {
-    return jiraRestClient.issueSearchApi().searchForIssuesUsingJql("issue = " + id, null, 50, "", null, null, null, null, null);
-  }
-
   private void linkIssues(JiraRestClient jiraRestClient, IssueBean issue, PostFormField field) {
     String value = CollectionUtils.isNotEmpty(field.getValue()) ? field.getValue().get(0) : "";
     if (StringUtils.isNotEmpty(value)) {

src/main/java/com/epam/reportportal/extension/jira/command/TestConnectionCommand.java

@@ -61,8 +61,7 @@ public Boolean executeCommand(Integration integration, Map<String, Object> param
       return jn != null;
     } catch (Exception e) {
       LOGGER.error("Unable to connect to Cloud Jira: ", e);
-      throw new ReportPortalException(ErrorType.UNABLE_INTERACT_WITH_INTEGRATION,
-          String.format("Unable to connect to Cloud Jira. Message: %s", e.getMessage()), e);
+      throw new ReportPortalException(ErrorType.UNABLE_INTERACT_WITH_INTEGRATION, "Unable to connect to Cloud Jira");
     }
   }
 }

src/main/java/com/epam/reportportal/extension/jira/command/utils/JIRATicketUtils.java

@@ -128,13 +128,12 @@ public static IssueUpdateDetails toIssueInput(JiraRestClient client, Project jir
         continue;
       }
       if (one.getId().equalsIgnoreCase(IssueField.PRIORITY_FIELD.value)) {
-        if (IssuePriority.findByName(one.getValue().get(0)) != null) {
-          issueUpdateDetails.putFieldsItem(IssueField.PRIORITY_FIELD.value, one.getValue().get(0));
-        }
+        issueUpdateDetails.putFieldsItem(IssueField.PRIORITY_FIELD.value, Map.entry("name", one.getValue().get(0)));
         continue;
       }
       if (one.getId().equalsIgnoreCase(IssueField.COMPONENTS_FIELD.value)) {
-        issueUpdateDetails.putFieldsItem(IssueField.COMPONENTS_FIELD.value, one.getValue());
+        var names = one.getValue().stream().map(field -> Map.entry("name", field)).toList();
+        issueUpdateDetails.putFieldsItem(IssueField.COMPONENTS_FIELD.getValue(), names);
         continue;
       }
       if (one.getId().equalsIgnoreCase(ASSIGNEE_FIELD.getValue())) {