SONAR-4291 Revert unplanned issues and new unplanned issues measures

diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/IssueCountersDecorator.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/IssueCountersDecorator.java
index 63279f5299f7a0209f7affdc54de7ae1d4c439b4..080dccfbef3e4b042f4bfa7acfbe50f76897e745 100644 (file)
--- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/IssueCountersDecorator.java
+++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/IssueCountersDecorator.java
@@ -80,9 +80,7 @@ public class IssueCountersDecorator implements Decorator {
       CoreMetrics.NEW_MINOR_ISSUES,
       CoreMetrics.NEW_INFO_ISSUES,
       CoreMetrics.FALSE_POSITIVE_ISSUES,
-      CoreMetrics.UNASSIGNED_ISSUES,
-      CoreMetrics.UNPLANNED_ISSUES,
-      CoreMetrics.NEW_UNPLANNED_ISSUES
+      CoreMetrics.UNASSIGNED_ISSUES
     );
   }
 
@@ -126,11 +124,9 @@ public class IssueCountersDecorator implements Decorator {
 
       saveTotalIssues(context, issues);
       saveNewIssues(context, issues, shouldSaveNewMetrics);
-      saveNewUnplannedIssues(context, issues);
 
       saveMeasure(context, CoreMetrics.UNASSIGNED_ISSUES, countUnassigned);
       saveMeasure(context, CoreMetrics.FALSE_POSITIVE_ISSUES, falsePositives);
-      saveMeasure(context, CoreMetrics.UNPLANNED_ISSUES, unplanned);
     }
   }
 
@@ -239,27 +235,6 @@ public class IssueCountersDecorator implements Decorator {
     context.saveMeasure(measure);
   }
 
-  protected void saveNewUnplannedIssues(DecoratorContext context, Collection<Issue> issues) {
-    Measure measure = new Measure(CoreMetrics.NEW_UNPLANNED_ISSUES);
-    for (PastSnapshot pastSnapshot : timeMachineConfiguration.getProjectPastSnapshots()) {
-      int newUnplannedIssues = countNewUnplannedIssuesForSnapshot(pastSnapshot, issues);
-      int variationIndex = pastSnapshot.getIndex();
-      Collection<Measure> children = context.getChildrenMeasures(CoreMetrics.NEW_UNPLANNED_ISSUES);
-      double sumNewUnplannedIssues = MeasureUtils.sumOnVariation(true, variationIndex, children) + newUnplannedIssues;
-      measure.setVariation(variationIndex, sumNewUnplannedIssues);
-    }
-    context.saveMeasure(measure);
-  }
-
-  protected int countNewUnplannedIssuesForSnapshot(final PastSnapshot pastSnapshot, Collection<Issue> issues) {
-    return newArrayList(Iterables.filter(issues, new Predicate<Issue>() {
-      @Override
-      public boolean apply(Issue issue) {
-        return isAfter(issue, pastSnapshot.getTargetDate()) && issue.actionPlanKey() == null;
-      }
-    })).size();
-  }
-
   private void saveMeasure(DecoratorContext context, Metric metric, int value) {
     context.saveMeasure(metric, (double) (value + sumChildren(context, metric)));
   }

diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/issue/IssueCountersDecoratorTest.java b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/issue/IssueCountersDecoratorTest.java
index ae7896317bbc72540e2c449bcaefcc6a013129f7..af6dfb4e1d9800aea91de62859071c7c6577ebb3 100644 (file)
--- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/issue/IssueCountersDecoratorTest.java
+++ b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/issue/IssueCountersDecoratorTest.java
@@ -231,19 +231,6 @@ public class IssueCountersDecoratorTest {
     verify(context).saveMeasure(CoreMetrics.FALSE_POSITIVE_ISSUES, 1.0);
   }
 
-  @Test
-  public void should_save_unplanned_issues() {
-    List<Issue> issues = newArrayList();
-    issues.add(new DefaultIssue().setRuleKey(ruleA1.ruleKey()).setActionPlanKey("ABCD").setSeverity(RulePriority.CRITICAL.name()));
-    issues.add(new DefaultIssue().setRuleKey(ruleA1.ruleKey()).setSeverity(RulePriority.CRITICAL.name()));
-    issues.add(new DefaultIssue().setRuleKey(ruleA1.ruleKey()).setSeverity(RulePriority.CRITICAL.name()));
-    when(issuable.issues()).thenReturn(issues);
-
-    decorator.decorate(resource, context);
-
-    verify(context).saveMeasure(CoreMetrics.UNPLANNED_ISSUES, 2.0);
-  }
-
   @Test
   public void same_rule_should_have_different_severities() {
     List<Issue> issues = newArrayList();
@@ -321,22 +308,6 @@ public class IssueCountersDecoratorTest {
     verify(context, never()).saveMeasure(argThat(new IsMetricMeasure(CoreMetrics.NEW_CRITICAL_ISSUES)));
   }
 
-  @Test
-  public void should_save_new_unplanned_issues(){
-    List<Issue> issues = newArrayList();
-    issues.add(new DefaultIssue().setRuleKey(ruleA1.ruleKey()).setActionPlanKey("ABCD").setSeverity(RulePriority.CRITICAL.name()).setCreationDate(rightNow));
-    issues.add(new DefaultIssue().setRuleKey(ruleA2.ruleKey()).setSeverity(RulePriority.CRITICAL.name()).setCreationDate(rightNow));
-    issues.add(new DefaultIssue().setRuleKey(ruleA1.ruleKey()).setActionPlanKey("ABCD").setSeverity(RulePriority.CRITICAL.name()).setCreationDate(fiveDaysAgo));
-    issues.add(new DefaultIssue().setRuleKey(ruleA2.ruleKey()).setSeverity(RulePriority.CRITICAL.name()).setCreationDate(fiveDaysAgo));
-    issues.add(new DefaultIssue().setRuleKey(ruleB1.ruleKey()).setSeverity(RulePriority.CRITICAL.name()).setCreationDate(tenDaysAgo));
-    when(issuable.issues()).thenReturn(issues);
-
-    decorator.decorate(resource, context);
-
-    // remember : period1 is 5daysAgo, period2 is 10daysAgo
-    verify(context).saveMeasure(argThat(new IsVariationMeasure(CoreMetrics.NEW_UNPLANNED_ISSUES, 1.0, 2.0)));
-  }
-
   private List<Issue> createIssues() {
     List<Issue> issues = newArrayList();
     issues.add(new DefaultIssue().setRuleKey(ruleA1.ruleKey()).setSeverity(RulePriority.CRITICAL.name()).setStatus(Issue.STATUS_OPEN));