From ccc92bfab6287510eb5d77d2b5f904be4feffd01 Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Lesaint?= Date: Wed, 10 Jun 2015 10:54:01 +0200 Subject: [PATCH] SONAR-6620 rename Metric.getMetricType to getType --- .../measure/BatchMeasureToMeasure.java | 4 ++-- .../server/computation/measure/Measure.java | 2 -- .../computation/measure/MeasureDtoToMeasure.java | 4 ++-- .../sonar/server/computation/metric/Metric.java | 2 +- .../server/computation/metric/MetricImpl.java | 16 ++++++++-------- .../measure/MeasureRepositoryImplTest.java | 4 ++-- .../computation/metric/MetricImplTest.java | 4 ++-- .../metric/MetricRepositoryImplTest.java | 2 +- 8 files changed, 18 insertions(+), 20 deletions(-) diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/BatchMeasureToMeasure.java b/server/sonar-server/src/main/java/org/sonar/server/computation/measure/BatchMeasureToMeasure.java index 35a6966560b..383a5bb3b8d 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/BatchMeasureToMeasure.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/measure/BatchMeasureToMeasure.java @@ -34,7 +34,7 @@ public class BatchMeasureToMeasure { } String data = batchMeasure.hasStringValue() ? batchMeasure.getStringValue() : null; - switch (metric.getMetricType().getValueType()) { + switch (metric.getType().getValueType()) { case INT: return toIntegerMeasure(batchMeasure, data); case LONG: @@ -50,7 +50,7 @@ public class BatchMeasureToMeasure { case NO_VALUE: return toNoValueMeasure(batchMeasure); default: - throw new IllegalArgumentException("Unsupported Measure.ValueType " + metric.getMetricType().getValueType()); + throw new IllegalArgumentException("Unsupported Measure.ValueType " + metric.getType().getValueType()); } } diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/Measure.java b/server/sonar-server/src/main/java/org/sonar/server/computation/measure/Measure.java index 7d420c8c519..6ce4e144515 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/Measure.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/measure/Measure.java @@ -154,8 +154,6 @@ public interface Measure { *

* If the measure type is {@link Measure.ValueType#STRING}, the value returned by this function is the same as {@link #getStringValue()}. *

- * - * @throws IllegalStateException if the value type of the measure is not {@link Measure.ValueType#BOOLEAN} */ @CheckForNull String getData(); diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/MeasureDtoToMeasure.java b/server/sonar-server/src/main/java/org/sonar/server/computation/measure/MeasureDtoToMeasure.java index c2dad3d403d..55a61a1a8a1 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/MeasureDtoToMeasure.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/measure/MeasureDtoToMeasure.java @@ -37,7 +37,7 @@ public class MeasureDtoToMeasure { Double value = measureDto.getValue(); String data = measureDto.getData(); - switch (metric.getMetricType().getValueType()) { + switch (metric.getType().getValueType()) { case INT: return toIntegerMeasure(measureDto, value, data); case LONG: @@ -53,7 +53,7 @@ public class MeasureDtoToMeasure { case NO_VALUE: return toNoValueMeasure(measureDto); default: - throw new IllegalArgumentException("Unsupported Measure.ValueType " + metric.getMetricType().getValueType()); + throw new IllegalArgumentException("Unsupported Measure.ValueType " + metric.getType().getValueType()); } } diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/metric/Metric.java b/server/sonar-server/src/main/java/org/sonar/server/computation/metric/Metric.java index 52035df4ffa..e96388d1f29 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/metric/Metric.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/metric/Metric.java @@ -29,7 +29,7 @@ public interface Metric { String getName(); - MetricType getMetricType(); + MetricType getType(); enum MetricType { INT(Measure.ValueType.INT), diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/metric/MetricImpl.java b/server/sonar-server/src/main/java/org/sonar/server/computation/metric/MetricImpl.java index d28f64a3ecb..58153bfe8bf 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/metric/MetricImpl.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/metric/MetricImpl.java @@ -30,12 +30,12 @@ public final class MetricImpl implements Metric { private final String key; private final String name; - private final MetricType metricType; + private final MetricType type; - public MetricImpl(String key, String name, MetricType metricType) { + public MetricImpl(String key, String name, MetricType type) { this.key = requireNonNull(key); this.name = requireNonNull(name); - this.metricType = requireNonNull(metricType); + this.type = requireNonNull(type); } @Override @@ -49,8 +49,8 @@ public final class MetricImpl implements Metric { } @Override - public MetricType getMetricType() { - return metricType; + public MetricType getType() { + return type; } @Override @@ -63,12 +63,12 @@ public final class MetricImpl implements Metric { } MetricImpl metric = (MetricImpl) o; return Objects.equals(key, metric.key) && - Objects.equals(metricType, metric.metricType); + Objects.equals(type, metric.type); } @Override public int hashCode() { - return Objects.hash(key, metricType); + return Objects.hash(key, type); } @Override @@ -76,7 +76,7 @@ public final class MetricImpl implements Metric { return com.google.common.base.Objects.toStringHelper(this) .add("key", key) .add("name", name) - .add("metricType", metricType) + .add("type", type) .toString(); } } diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/measure/MeasureRepositoryImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/measure/MeasureRepositoryImplTest.java index 4a3d0f15859..6824f56c41c 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/measure/MeasureRepositoryImplTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/measure/MeasureRepositoryImplTest.java @@ -86,9 +86,9 @@ public class MeasureRepositoryImplTest { @Before public void setUp() throws Exception { when(metric1.getKey()).thenReturn(METRIC_KEY_1); - when(metric1.getMetricType()).thenReturn(Metric.MetricType.STRING); + when(metric1.getType()).thenReturn(Metric.MetricType.STRING); when(metric2.getKey()).thenReturn(METRIC_KEY_2); - when(metric2.getMetricType()).thenReturn(Metric.MetricType.STRING); + when(metric2.getType()).thenReturn(Metric.MetricType.STRING); // references to metrics are consistent with DB by design when(metricRepository.getByKey(METRIC_KEY_1)).thenReturn(metric1); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/metric/MetricImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/metric/MetricImplTest.java index 9ff5e5171ff..7e7de32a34f 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/metric/MetricImplTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/metric/MetricImplTest.java @@ -49,7 +49,7 @@ public class MetricImplTest { assertThat(metric.getKey()).isEqualTo(SOME_KEY); assertThat(metric.getName()).isEqualTo(SOME_NAME); - assertThat(metric.getMetricType()).isEqualTo(Metric.MetricType.FLOAT); + assertThat(metric.getType()).isEqualTo(Metric.MetricType.FLOAT); } @Test @@ -76,7 +76,7 @@ public class MetricImplTest { @Test public void all_fields_are_displayed_in_toString() { assertThat(new MetricImpl(SOME_KEY, SOME_NAME, Metric.MetricType.FLOAT).toString()) - .isEqualTo("MetricImpl{key=key, name=name, metricType=FLOAT}"); + .isEqualTo("MetricImpl{key=key, name=name, type=FLOAT}"); } } diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/metric/MetricRepositoryImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/metric/MetricRepositoryImplTest.java index fa1e114df8d..813d36c7469 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/metric/MetricRepositoryImplTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/metric/MetricRepositoryImplTest.java @@ -89,7 +89,7 @@ public class MetricRepositoryImplTest { assertThat(metric.getKey()).isEqualTo(metricDto.getKey()); assertThat(metric.getName()).isEqualTo(metricDto.getShortName()); - assertThat(metric.getMetricType()).isEqualTo(expected); + assertThat(metric.getType()).isEqualTo(expected); } @Test(expected = IllegalArgumentException.class) -- 2.39.5