From 659ff60252fcf0ca4f34bb69010be0043ef1c675 Mon Sep 17 00:00:00 2001 From: Julien Lancelot Date: Wed, 12 Mar 2014 08:25:20 +0100 Subject: [PATCH] SONAR-5056 Removed some useless usage of Requirement --- .../plugins/core/timemachine/VariationDecorator.java | 4 +--- .../java/org/sonar/batch/index/MeasurePersister.java | 10 +++------- .../src/main/java/org/sonar/api/measures/Measure.java | 6 +----- .../java/org/sonar/api/measures/MeasuresFilters.java | 4 ++++ 4 files changed, 9 insertions(+), 15 deletions(-) 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 faf7e3b02cd..efebe9d7a62 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 @@ -28,7 +28,6 @@ import org.sonar.api.resources.Qualifiers; import org.sonar.api.resources.Resource; import org.sonar.api.resources.Scopes; import org.sonar.api.technicaldebt.batch.Characteristic; -import org.sonar.api.technicaldebt.batch.Requirement; import org.sonar.batch.components.PastMeasuresLoader; import org.sonar.batch.components.PastSnapshot; import org.sonar.batch.components.TimeMachineConfiguration; @@ -97,8 +96,7 @@ public class VariationDecorator implements Decorator { // compare with past measure Integer metricId = measure.getMetric().getId() != null ? measure.getMetric().getId() : metricFinder.findByKey(measure.getMetric().getKey()).getId(); Characteristic characteristic = measure.getCharacteristic(); - Requirement requirement = measure.getRequirement(); - Integer characteristicId = characteristic != null ? characteristic.id() : requirement != null ? requirement.id() : null; + Integer characteristicId = characteristic != null ? characteristic.id() : null; Integer personId = measure.getPersonId(); Integer ruleId = measure instanceof RuleMeasure ? ((RuleMeasure) measure).getRule().getId() : null; diff --git a/sonar-batch/src/main/java/org/sonar/batch/index/MeasurePersister.java b/sonar-batch/src/main/java/org/sonar/batch/index/MeasurePersister.java index 25b0cb369e3..564ee82ec72 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/index/MeasurePersister.java +++ b/sonar-batch/src/main/java/org/sonar/batch/index/MeasurePersister.java @@ -35,7 +35,6 @@ import org.sonar.api.resources.ResourceUtils; import org.sonar.api.rules.Rule; import org.sonar.api.rules.RuleFinder; import org.sonar.api.technicaldebt.batch.Characteristic; -import org.sonar.api.technicaldebt.batch.Requirement; import org.sonar.api.utils.SonarException; import org.sonar.core.persistence.MyBatis; @@ -112,9 +111,9 @@ public final class MeasurePersister { !(ResourceUtils.isEntity(resource) && measure.isBestValue()) && isMeasureNotEmpty(measure); } - private static boolean isMeasureNotEmpty(Measure measure){ + private static boolean isMeasureNotEmpty(Measure measure) { boolean isNotEmpty = false; - for (int i = 1; i<=5; i++) { + for (int i = 1; i <= 5; i++) { isNotEmpty = isNotEmpty || measure.getVariation(i) != null; } return measure.getValue() != null || measure.getData() != null @@ -155,16 +154,13 @@ public final class MeasurePersister { model.setVariationValue5(measure.getVariation5()); model.setUrl(measure.getUrl()); Characteristic characteristic = measure.getCharacteristic(); - Requirement requirement = measure.getRequirement(); if (characteristic != null) { model.setCharacteristicId(characteristic.id()); - } else if (requirement != null) { - model.setCharacteristicId(requirement.id()); } model.setPersonId(measure.getPersonId()); Double value = measure.getValue(); if (value != null) { - model.setValue(value.doubleValue()); + model.setValue(value); } else { model.setValue(null); } diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/measures/Measure.java b/sonar-plugin-api/src/main/java/org/sonar/api/measures/Measure.java index 25d5a2c76fa..e2448adb5da 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/measures/Measure.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/measures/Measure.java @@ -652,7 +652,7 @@ public class Measure { private static boolean isZeroVariation(Double... variations) { for (Double variation : variations) { - if (!((variation == null) || NumberUtils.compare(variation.doubleValue(), 0.0) == 0)) { + if (!((variation == null) || NumberUtils.compare(variation, 0.0) == 0)) { return false; } } @@ -684,9 +684,6 @@ public class Measure { if (characteristic != null ? !characteristic.equals(measure.characteristic) : measure.characteristic != null) { return false; } - if (requirement != null ? !requirement.equals(measure.requirement) : measure.requirement != null) { - return false; - } if (personId != null ? !personId.equals(measure.personId) : measure.personId != null) { return false; } @@ -697,7 +694,6 @@ public class Measure { public int hashCode() { int result = metricKey != null ? metricKey.hashCode() : 0; result = 31 * result + (characteristic != null ? characteristic.hashCode() : 0); - result = 31 * result + (requirement != null ? requirement.hashCode() : 0); result = 31 * result + (personId != null ? personId.hashCode() : 0); return result; } diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/measures/MeasuresFilters.java b/sonar-plugin-api/src/main/java/org/sonar/api/measures/MeasuresFilters.java index 8c34e3ce176..2e5309e4673 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/measures/MeasuresFilters.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/measures/MeasuresFilters.java @@ -94,6 +94,10 @@ public final class MeasuresFilters { measureCharacteristic.equals(characteristic); } + /** + * @deprecated since 4.3 + */ + @Deprecated public static MeasuresFilter requirement(final Metric metric, final Requirement requirement) { return new MetricFilter(metric) { -- 2.39.5