|
11 | 11 | import org.hibernate.infra.replicate.jira.service.jira.client.JiraRestException;
|
12 | 12 | import org.hibernate.infra.replicate.jira.service.jira.model.rest.JiraFields;
|
13 | 13 | import org.hibernate.infra.replicate.jira.service.jira.model.rest.JiraIssue;
|
14 |
| -import org.hibernate.infra.replicate.jira.service.jira.model.rest.JiraIssueTransition; |
15 | 14 | import org.hibernate.infra.replicate.jira.service.jira.model.rest.JiraTransition;
|
16 | 15 | import org.hibernate.infra.replicate.jira.service.reporting.ReportingConfig;
|
17 | 16 |
|
@@ -83,15 +82,14 @@ private void handleDeletedMovedIssue(String type) {
|
83 | 82 | private Optional<JiraTransition> prepareTransition(JiraIssue issue) {
|
84 | 83 | Optional<String> deletedStatus = context.projectGroup().statuses().deletedStatus();
|
85 | 84 | if (deletedStatus.isPresent()) {
|
86 |
| - prepareTransition(deletedStatus.get(), issue); |
87 |
| - JiraTransition transition = new JiraTransition(); |
88 |
| - transition.transition = new JiraIssueTransition(deletedStatus.get()); |
89 |
| - |
90 |
| - Optional<String> deletedResolution = context.projectGroup().statuses().deletedResolution(); |
91 |
| - deletedResolution.ifPresent( |
92 |
| - name -> transition.properties().put("fields", Map.of("resolution", Map.of("name", name)))); |
93 |
| - |
94 |
| - return Optional.of(transition); |
| 85 | + Optional<JiraTransition> transition = prepareTransition(deletedStatus.get(), issue); |
| 86 | + |
| 87 | + return transition.map(tr -> { |
| 88 | + Optional<String> deletedResolution = context.projectGroup().statuses().deletedResolution(); |
| 89 | + deletedResolution |
| 90 | + .ifPresent(name -> tr.properties().put("fields", Map.of("resolution", Map.of("name", name)))); |
| 91 | + return tr; |
| 92 | + }); |
95 | 93 | }
|
96 | 94 |
|
97 | 95 | return Optional.empty();
|
|
0 commit comments