3 * Copyright (C) 2009-2017 SonarSource SA
4 * mailto:info AT sonarsource DOT com
6 * This program is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Lesser General Public
8 * License as published by the Free Software Foundation; either
9 * version 3 of the License, or (at your option) any later version.
11 * This program is distributed in the hope that it will be useful,
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
14 * Lesser General Public License for more details.
16 * You should have received a copy of the GNU Lesser General Public License
17 * along with this program; if not, write to the Free Software Foundation,
18 * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
20 package org.sonar.server.computation.task.projectanalysis.issue;
22 import java.util.Collection;
24 import org.sonar.core.issue.DefaultIssue;
25 import org.sonar.core.issue.ShortBranchIssue;
26 import org.sonar.core.issue.tracking.SimpleTracker;
27 import org.sonar.core.issue.tracking.Tracking;
28 import org.sonar.server.computation.task.projectanalysis.component.Component;
30 public class ShortBranchIssueMerger {
31 private final ShortBranchIssuesLoader shortBranchIssuesLoader;
32 private final SimpleTracker<DefaultIssue, ShortBranchIssue> tracker;
33 private final IssueLifecycle issueLifecycle;
35 public ShortBranchIssueMerger(ShortBranchIssuesLoader resolvedShortBranchIssuesLoader, IssueLifecycle issueLifecycle) {
36 this(resolvedShortBranchIssuesLoader, new SimpleTracker<>(), issueLifecycle);
39 public ShortBranchIssueMerger(ShortBranchIssuesLoader shortBranchIssuesLoader, SimpleTracker<DefaultIssue, ShortBranchIssue> tracker, IssueLifecycle issueLifecycle) {
40 this.shortBranchIssuesLoader = shortBranchIssuesLoader;
41 this.tracker = tracker;
42 this.issueLifecycle = issueLifecycle;
46 * Look for all resolved/confirmed issues in short living branches targeting the current long living branch, and run
47 * a light issue tracking to find matches. Then merge issue attributes in the new issues.
49 public void tryMerge(Component component, Collection<DefaultIssue> newIssues) {
50 Collection<ShortBranchIssue> shortBranchIssues = shortBranchIssuesLoader.loadCandidateIssuesForMergingInTargetBranch(component);
51 Tracking<DefaultIssue, ShortBranchIssue> tracking = tracker.track(newIssues, shortBranchIssues);
53 Map<DefaultIssue, ShortBranchIssue> matchedRaws = tracking.getMatchedRaws();
55 Map<ShortBranchIssue, DefaultIssue> defaultIssues = shortBranchIssuesLoader.loadDefaultIssuesWithChanges(matchedRaws.values());
57 for (Map.Entry<DefaultIssue, ShortBranchIssue> e : matchedRaws.entrySet()) {
58 ShortBranchIssue issue = e.getValue();
59 issueLifecycle.mergeConfirmedOrResolvedFromShortLivingBranch(e.getKey(), defaultIssues.get(issue), issue.getBranchName());