From ca0ed91075230277843c2e0c5fa4f210f1131f04 Mon Sep 17 00:00:00 2001 From: Julien Lancelot Date: Thu, 28 Nov 2013 13:10:42 +0100 Subject: [PATCH] Fix quality flaw --- .../sonar/plugins/core/timemachine/VariationDecorator.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/VariationDecorator.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/VariationDecorator.java index faae4da4e26..83ce44f3cef 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/VariationDecorator.java +++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/VariationDecorator.java @@ -27,6 +27,8 @@ import org.sonar.api.resources.Project; import org.sonar.api.resources.Qualifiers; import org.sonar.api.resources.Resource; import org.sonar.api.resources.Scopes; +import org.sonar.api.technicaldebt.Characteristic; +import org.sonar.api.technicaldebt.Requirement; import org.sonar.batch.components.PastMeasuresLoader; import org.sonar.batch.components.PastSnapshot; import org.sonar.batch.components.TimeMachineConfiguration; @@ -94,7 +96,9 @@ public class VariationDecorator implements Decorator { for (Measure measure : context.getMeasures(MeasuresFilters.all())) { // compare with past measure Integer metricId = measure.getMetric().getId() != null ? measure.getMetric().getId() : metricFinder.findByKey(measure.getMetric().getKey()).getId(); - Integer characteristicId = measure.getCharacteristic() != null ? measure.getCharacteristic().id() : null; + Characteristic characteristic = measure.getCharacteristic(); + Requirement requirement = measure.getRequirement(); + Integer characteristicId = characteristic != null ? characteristic.id() : requirement != null ? requirement.id() : null; Integer personId = measure.getPersonId(); Integer ruleId = measure instanceof RuleMeasure ? ((RuleMeasure) measure).getRule().getId() : null; -- 2.39.5