Skip to content
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.Set;
import java.util.function.BiFunction;
Expand Down Expand Up @@ -130,7 +132,18 @@ protected void upgradesApplied(List<Upgrade> upgrades) {

private void applyUpgrades(GitHubRepository repository, List<String> issueLabels, Milestone milestone,
List<Upgrade> upgrades) {
List<Issue> existingUpgradeIssues = repository.findIssues(issueLabels, milestone);
List<Issue> existingUpgradeIssuesList = repository.findIssues(issueLabels, milestone);

Map<String, Issue> existingUpgradeIssues = new HashMap<>(existingUpgradeIssuesList.size());
for (Issue issue : existingUpgradeIssuesList) {
String title = issue.getTitle();
int lastSpaceIndex = title.lastIndexOf(' ');
if (lastSpaceIndex > -1) {
title = title.substring(0, lastSpaceIndex);
}
existingUpgradeIssues.put(title, issue);
}

System.out.println("Applying upgrades...");
System.out.println("");
for (Upgrade upgrade : upgrades) {
Expand Down Expand Up @@ -222,19 +235,9 @@ private Milestone determineMilestone(GitHubRepository repository) {
return matchingMilestone.get();
}

private Issue findExistingUpgradeIssue(List<Issue> existingUpgradeIssues, Upgrade upgrade) {
private Issue findExistingUpgradeIssue(Map<String, Issue> existingUpgradeIssues, Upgrade upgrade) {
String toMatch = "Upgrade to " + upgrade.toRelease().getName();
for (Issue existingUpgradeIssue : existingUpgradeIssues) {
String title = existingUpgradeIssue.getTitle();
int lastSpaceIndex = title.lastIndexOf(' ');
if (lastSpaceIndex > -1) {
title = title.substring(0, lastSpaceIndex);
}
if (title.equals(toMatch)) {
return existingUpgradeIssue;
}
}
return null;
return existingUpgradeIssues.get(toMatch);
}

@SuppressWarnings("deprecation")
Expand Down