aboutsummaryrefslogtreecommitdiffstats
path: root/server
diff options
context:
space:
mode:
authorSébastien Lesaint <sebastien.lesaint@sonarsource.com>2018-03-30 14:55:09 +0200
committerSonarTech <sonartech@sonarsource.com>2018-04-06 20:21:52 +0200
commitd14a8d485f80d1c1a302a31f6d8e31f52312989a (patch)
tree2992fa2e2becafe38228636bcb4368cefe624289 /server
parent90a88649115fc7b8e6cd011e7454c8e66aab6591 (diff)
downloadsonarqube-d14a8d485f80d1c1a302a31f6d8e31f52312989a.tar.gz
sonarqube-d14a8d485f80d1c1a302a31f6d8e31f52312989a.zip
GOV-333 views refresh takes project measure from live_measures table
instead of taking them from project_measures table to be able to support refresh of a view after a change through the UI which changes measures only in table live_measures
Diffstat (limited to 'server')
-rw-r--r--server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/LiveMeasureDtoToMeasure.java120
-rw-r--r--server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/LiveMeasureDtoToMeasureTest.java240
2 files changed, 360 insertions, 0 deletions
diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/LiveMeasureDtoToMeasure.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/LiveMeasureDtoToMeasure.java
new file mode 100644
index 00000000000..ec06d95627d
--- /dev/null
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/LiveMeasureDtoToMeasure.java
@@ -0,0 +1,120 @@
+/*
+ * SonarQube
+ * Copyright (C) 2009-2018 SonarSource SA
+ * mailto:info AT sonarsource DOT com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+package org.sonar.server.computation.task.projectanalysis.measure;
+
+import com.google.common.base.Optional;
+import javax.annotation.Nullable;
+import org.sonar.db.measure.LiveMeasureDto;
+import org.sonar.server.computation.task.projectanalysis.metric.Metric;
+
+import static com.google.common.base.Optional.of;
+import static java.util.Objects.requireNonNull;
+import static org.sonar.server.computation.task.projectanalysis.measure.Measure.Level.toLevel;
+
+public class LiveMeasureDtoToMeasure {
+
+ public Optional<Measure> toMeasure(@Nullable LiveMeasureDto measureDto, Metric metric) {
+ requireNonNull(metric);
+ if (measureDto == null) {
+ return Optional.absent();
+ }
+ Double value = measureDto.getValue();
+ String data = measureDto.getDataAsString();
+ switch (metric.getType().getValueType()) {
+ case INT:
+ return toIntegerMeasure(measureDto, value, data);
+ case LONG:
+ return toLongMeasure(measureDto, value, data);
+ case DOUBLE:
+ return toDoubleMeasure(measureDto, value, data);
+ case BOOLEAN:
+ return toBooleanMeasure(measureDto, value, data);
+ case STRING:
+ return toStringMeasure(measureDto, data);
+ case LEVEL:
+ return toLevelMeasure(measureDto, data);
+ case NO_VALUE:
+ return toNoValueMeasure(measureDto);
+ default:
+ throw new IllegalArgumentException("Unsupported Measure.ValueType " + metric.getType().getValueType());
+ }
+ }
+
+ private static Optional<Measure> toIntegerMeasure(LiveMeasureDto measureDto, @Nullable Double value, @Nullable String data) {
+ if (value == null) {
+ return toNoValueMeasure(measureDto);
+ }
+ return of(setCommonProperties(Measure.newMeasureBuilder(), measureDto).create(value.intValue(), data));
+ }
+
+ private static Optional<Measure> toLongMeasure(LiveMeasureDto measureDto, @Nullable Double value, @Nullable String data) {
+ if (value == null) {
+ return toNoValueMeasure(measureDto);
+ }
+ return of(setCommonProperties(Measure.newMeasureBuilder(), measureDto).create(value.longValue(), data));
+ }
+
+ private static Optional<Measure> toDoubleMeasure(LiveMeasureDto measureDto, @Nullable Double value, @Nullable String data) {
+ if (value == null) {
+ return toNoValueMeasure(measureDto);
+ }
+
+ return of(setCommonProperties(Measure.newMeasureBuilder(), measureDto)
+ .create(value.doubleValue(), org.sonar.api.measures.Metric.MAX_DECIMAL_SCALE, data));
+ }
+
+ private static Optional<Measure> toBooleanMeasure(LiveMeasureDto measureDto, @Nullable Double value, @Nullable String data) {
+ if (value == null) {
+ return toNoValueMeasure(measureDto);
+ }
+ return of(setCommonProperties(Measure.newMeasureBuilder(), measureDto).create(value == 1.0d, data));
+ }
+
+ private static Optional<Measure> toStringMeasure(LiveMeasureDto measureDto, @Nullable String data) {
+ if (data == null) {
+ return toNoValueMeasure(measureDto);
+ }
+ return of(setCommonProperties(Measure.newMeasureBuilder(), measureDto).create(data));
+ }
+
+ private static Optional<Measure> toLevelMeasure(LiveMeasureDto measureDto, @Nullable String data) {
+ if (data == null) {
+ return toNoValueMeasure(measureDto);
+ }
+ Optional<Measure.Level> level = toLevel(data);
+ if (!level.isPresent()) {
+ return toNoValueMeasure(measureDto);
+ }
+ return of(setCommonProperties(Measure.newMeasureBuilder(), measureDto).create(level.get()));
+ }
+
+ private static Optional<Measure> toNoValueMeasure(LiveMeasureDto measureDto) {
+ return of(setCommonProperties(Measure.newMeasureBuilder(), measureDto).createNoValue());
+ }
+
+ private static Measure.NewMeasureBuilder setCommonProperties(Measure.NewMeasureBuilder builder, LiveMeasureDto measureDto) {
+ Double variation = measureDto.getVariation();
+ if (variation != null) {
+ builder.setVariation(variation);
+ }
+ return builder;
+ }
+
+}
diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/LiveMeasureDtoToMeasureTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/LiveMeasureDtoToMeasureTest.java
new file mode 100644
index 00000000000..b3b8384ad46
--- /dev/null
+++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/LiveMeasureDtoToMeasureTest.java
@@ -0,0 +1,240 @@
+/*
+ * SonarQube
+ * Copyright (C) 2009-2018 SonarSource SA
+ * mailto:info AT sonarsource DOT com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+package org.sonar.server.computation.task.projectanalysis.measure;
+
+import com.google.common.base.Optional;
+import com.tngtech.java.junit.dataprovider.DataProvider;
+import com.tngtech.java.junit.dataprovider.DataProviderRunner;
+import com.tngtech.java.junit.dataprovider.UseDataProvider;
+import org.assertj.core.data.Offset;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import org.junit.runner.RunWith;
+import org.sonar.db.measure.LiveMeasureDto;
+import org.sonar.server.computation.task.projectanalysis.measure.Measure.Level;
+import org.sonar.server.computation.task.projectanalysis.metric.Metric;
+import org.sonar.server.computation.task.projectanalysis.metric.MetricImpl;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.guava.api.Assertions.assertThat;
+
+@RunWith(DataProviderRunner.class)
+public class LiveMeasureDtoToMeasureTest {
+ private static final Metric SOME_INT_METRIC = new MetricImpl(42, "int", "name", Metric.MetricType.INT);
+ private static final Metric SOME_LONG_METRIC = new MetricImpl(42, "long", "name", Metric.MetricType.WORK_DUR);
+ private static final Metric SOME_DOUBLE_METRIC = new MetricImpl(42, "double", "name", Metric.MetricType.FLOAT);
+ private static final Metric SOME_STRING_METRIC = new MetricImpl(42, "string", "name", Metric.MetricType.STRING);
+ private static final Metric SOME_BOOLEAN_METRIC = new MetricImpl(42, "boolean", "name", Metric.MetricType.BOOL);
+ private static final Metric SOME_LEVEL_METRIC = new MetricImpl(42, "level", "name", Metric.MetricType.LEVEL);
+
+ private static final String SOME_DATA = "some_data man!";
+ private static final String SOME_ALERT_TEXT = "some alert text_be_careFul!";
+ private static final LiveMeasureDto EMPTY_MEASURE_DTO = new LiveMeasureDto();
+
+ @Rule
+ public final ExpectedException expectedException = ExpectedException.none();
+
+ private LiveMeasureDtoToMeasure underTest = new LiveMeasureDtoToMeasure();
+
+ @Test
+ public void toMeasure_returns_absent_for_null_argument() {
+ assertThat(underTest.toMeasure(null, SOME_INT_METRIC)).isAbsent();
+ }
+
+ @Test(expected = NullPointerException.class)
+ public void toMeasure_throws_NPE_if_metric_argument_is_null() {
+ underTest.toMeasure(EMPTY_MEASURE_DTO, null);
+ }
+
+ @Test(expected = NullPointerException.class)
+ public void toMeasure_throws_NPE_if_both_arguments_are_null() {
+ underTest.toMeasure(null, null);
+ }
+
+ @Test
+ public void toMeasure_returns_no_value_if_dto_has_no_data_for_Level_Metric() {
+ Optional<Measure> measure = underTest.toMeasure(EMPTY_MEASURE_DTO, SOME_LEVEL_METRIC);
+ assertThat(measure).isPresent();
+ assertThat(measure.get().getValueType()).isEqualTo(Measure.ValueType.NO_VALUE);
+ }
+
+ @Test
+ public void toMeasure_returns_no_value_if_dto_has_invalid_data_for_Level_Metric() {
+ Optional<Measure> measure = underTest.toMeasure(new LiveMeasureDto().setData("trololo"), SOME_LEVEL_METRIC);
+ assertThat(measure).isPresent();
+ assertThat(measure.get().getValueType()).isEqualTo(Measure.ValueType.NO_VALUE);
+ }
+
+ @Test
+ public void toMeasure_returns_no_value_if_dta_has_data_in_wrong_case_for_Level_Metric() {
+ Optional<Measure> measure = underTest.toMeasure(new LiveMeasureDto().setData("waRn"), SOME_LEVEL_METRIC);
+ assertThat(measure).isPresent();
+ assertThat(measure.get().getValueType()).isEqualTo(Measure.ValueType.NO_VALUE);
+ }
+
+ @Test
+ public void toMeasure_returns_no_QualityGateStatus_if_dto_has_no_alertStatus_for_Level_Metric() {
+ Optional<Measure> measure = underTest.toMeasure(EMPTY_MEASURE_DTO, SOME_STRING_METRIC);
+ assertThat(measure).isPresent();
+ assertThat(measure.get().hasQualityGateStatus()).isFalse();
+ }
+
+ @Test
+ public void toMeasure_returns_no_QualityGateStatus_if_alertStatus_has_invalid_data_for_Level_Metric() {
+ Optional<Measure> measure = underTest.toMeasure(new LiveMeasureDto().setData("trololo"), SOME_STRING_METRIC);
+ assertThat(measure).isPresent();
+ assertThat(measure.get().hasQualityGateStatus()).isFalse();
+ }
+
+ @Test
+ public void toMeasure_returns_no_QualityGateStatus_if_alertStatus_has_data_in_wrong_case_for_Level_Metric() {
+ Optional<Measure> measure = underTest.toMeasure(new LiveMeasureDto().setData("waRn"), SOME_STRING_METRIC);
+ assertThat(measure).isPresent();
+ assertThat(measure.get().hasQualityGateStatus()).isFalse();
+ }
+
+ @Test
+ public void toMeasure_returns_value_for_LEVEL_Metric() {
+ for (Level level : Level.values()) {
+ verify_toMeasure_returns_value_for_LEVEL_Metric(level);
+ }
+ }
+
+ private void verify_toMeasure_returns_value_for_LEVEL_Metric(Level expectedLevel) {
+ Optional<Measure> measure = underTest.toMeasure(new LiveMeasureDto().setData(expectedLevel.name()), SOME_LEVEL_METRIC);
+ assertThat(measure).isPresent();
+ assertThat(measure.get().getValueType()).isEqualTo(Measure.ValueType.LEVEL);
+ assertThat(measure.get().getLevelValue()).isEqualTo(expectedLevel);
+ }
+
+ @Test
+ public void toMeasure_returns_no_value_if_dto_has_no_value_for_Int_Metric() {
+ Optional<Measure> measure = underTest.toMeasure(EMPTY_MEASURE_DTO, SOME_INT_METRIC);
+
+ assertThat(measure.isPresent()).isTrue();
+ assertThat(measure.get().getValueType()).isEqualTo(Measure.ValueType.NO_VALUE);
+ }
+
+ @Test
+ public void toMeasure_returns_int_part_of_value_in_dto_for_Int_Metric() {
+ Optional<Measure> measure = underTest.toMeasure(new LiveMeasureDto().setValue(1.5d), SOME_INT_METRIC);
+
+ assertThat(measure.isPresent()).isTrue();
+ assertThat(measure.get().getValueType()).isEqualTo(Measure.ValueType.INT);
+ assertThat(measure.get().getIntValue()).isEqualTo(1);
+ }
+
+ @Test
+ public void toMeasure_returns_no_value_if_dto_has_no_value_for_Long_Metric() {
+ Optional<Measure> measure = underTest.toMeasure(EMPTY_MEASURE_DTO, SOME_LONG_METRIC);
+
+ assertThat(measure.isPresent()).isTrue();
+ assertThat(measure.get().getValueType()).isEqualTo(Measure.ValueType.NO_VALUE);
+ }
+
+ @Test
+ public void toMeasure_returns_long_part_of_value_in_dto_for_Long_Metric() {
+ Optional<Measure> measure = underTest.toMeasure(new LiveMeasureDto().setValue(1.5d), SOME_LONG_METRIC);
+
+ assertThat(measure.isPresent()).isTrue();
+ assertThat(measure.get().getValueType()).isEqualTo(Measure.ValueType.LONG);
+ assertThat(measure.get().getLongValue()).isEqualTo(1);
+ }
+
+ @Test
+ public void toMeasure_returns_no_value_if_dto_has_no_value_for_Double_Metric() {
+ Optional<Measure> measure = underTest.toMeasure(EMPTY_MEASURE_DTO, SOME_DOUBLE_METRIC);
+
+ assertThat(measure.isPresent()).isTrue();
+ assertThat(measure.get().getValueType()).isEqualTo(Measure.ValueType.NO_VALUE);
+ }
+
+ @Test
+ public void toMeasure_returns_no_value_if_dto_has_no_value_for_Boolean_metric() {
+ Optional<Measure> measure = underTest.toMeasure(EMPTY_MEASURE_DTO, SOME_BOOLEAN_METRIC);
+
+ assertThat(measure.isPresent()).isTrue();
+ assertThat(measure.get().getValueType()).isEqualTo(Measure.ValueType.NO_VALUE);
+ }
+
+ @Test
+ public void toMeasure_returns_false_value_if_dto_has_invalid_value_for_Boolean_metric() {
+ Optional<Measure> measure = underTest.toMeasure(new LiveMeasureDto().setValue(1.987d), SOME_BOOLEAN_METRIC);
+
+ assertThat(measure.isPresent()).isTrue();
+ assertThat(measure.get().getValueType()).isEqualTo(Measure.ValueType.BOOLEAN);
+ assertThat(measure.get().getBooleanValue()).isFalse();
+ }
+
+ @Test
+ public void toMeasure_returns_no_value_if_dto_has_no_value_for_String_Metric() {
+ Optional<Measure> measure = underTest.toMeasure(EMPTY_MEASURE_DTO, SOME_STRING_METRIC);
+
+ assertThat(measure.isPresent()).isTrue();
+ assertThat(measure.get().getValueType()).isEqualTo(Measure.ValueType.NO_VALUE);
+ }
+
+ @DataProvider
+ public static Object[][] all_types_LiveMeasureDtos() {
+ return new Object[][] {
+ {new LiveMeasureDto().setValue(1d), SOME_BOOLEAN_METRIC},
+ {new LiveMeasureDto().setValue(1d), SOME_INT_METRIC},
+ {new LiveMeasureDto().setValue(1d), SOME_LONG_METRIC},
+ {new LiveMeasureDto().setValue(1d), SOME_DOUBLE_METRIC},
+ {new LiveMeasureDto().setData("1"), SOME_STRING_METRIC},
+ {new LiveMeasureDto().setData(Level.OK.name()), SOME_LEVEL_METRIC}
+ };
+ }
+
+ @Test
+ @UseDataProvider("all_types_LiveMeasureDtos")
+ public void toMeasure_creates_no_MeasureVariation_if_dto_has_none_whichever_the_ValueType(LiveMeasureDto LiveMeasureDto, Metric metric) {
+ assertThat(underTest.toMeasure(LiveMeasureDto, metric).get().hasVariation()).isFalse();
+ }
+
+ @Test
+ @UseDataProvider("all_types_LiveMeasureDtos")
+ public void toMeasure_creates_MeasureVariation_and_maps_the_right_one(LiveMeasureDto builder, Metric metric) {
+ assertThat(underTest.toMeasure(builder.setVariation(1d), metric).get().getVariation()).isEqualTo(1);
+ }
+
+ @Test
+ public void toMeasure_creates_MeasureVariation_and_maps_the_right_one() {
+ LiveMeasureDto LiveMeasureDto = new LiveMeasureDto()
+ .setData("1")
+ .setVariation(2d);
+
+ Optional<Measure> measure = underTest.toMeasure(LiveMeasureDto, SOME_STRING_METRIC);
+
+ assertThat(measure.get().getVariation()).isEqualTo(2);
+ }
+
+ @Test
+ public void toMeasure_should_not_loose_decimals_of_float_values() {
+ MetricImpl metric = new MetricImpl(42, "double", "name", Metric.MetricType.FLOAT, 5, null, false);
+ LiveMeasureDto LiveMeasureDto = new LiveMeasureDto()
+ .setValue(0.12345);
+
+ Optional<Measure> measure = underTest.toMeasure(LiveMeasureDto, metric);
+
+ assertThat(measure.get().getDoubleValue()).isEqualTo(0.12345, Offset.offset(0.000001));
+ }
+}