Skip to content

Commit

Permalink
better name for Measure methods returning a builder
Browse files Browse the repository at this point in the history
  • Loading branch information
@sns-seb
sns-seb committed Jun 18, 2015
1 parent 3aa8352 commit 424cd7b
Show file tree
Hide file tree
Showing 8 changed files with 91 additions and 91 deletions.
6 changes: 3 additions & 3 deletions ...onar-server/src/main/java/org/sonar/server/computation/measure/BatchMeasureToMeasure.java
View file
Expand Up @@ -70,13 +70,13 @@ private Measure.NewMeasureBuilder createBuilder(BatchReport.Measure batchMeasure
throw new IllegalArgumentException("Measure with both characteristicId and ruleKey are not supported"); throw new IllegalArgumentException("Measure with both characteristicId and ruleKey are not supported");
} }
if (batchMeasure.hasCharactericId()) { if (batchMeasure.hasCharactericId()) {
return Measure.newMeasure().forCharacteristic(batchMeasure.getCharactericId()); return Measure.newMeasureBuilder().forCharacteristic(batchMeasure.getCharactericId());
} }
if (batchMeasure.hasRuleKey()) { if (batchMeasure.hasRuleKey()) {
RuleDto ruleDto = ruleCache.get(RuleKey.parse(batchMeasure.getRuleKey())); RuleDto ruleDto = ruleCache.get(RuleKey.parse(batchMeasure.getRuleKey()));
return Measure.newMeasure().forRule(ruleDto.getId()); return Measure.newMeasureBuilder().forRule(ruleDto.getId());
} }
return Measure.newMeasure(); return Measure.newMeasureBuilder();
} }


private static Optional<Measure> toIntegerMeasure(Measure.NewMeasureBuilder builder, BatchReport.Measure batchMeasure, @Nullable String data) { private static Optional<Measure> toIntegerMeasure(Measure.NewMeasureBuilder builder, BatchReport.Measure batchMeasure, @Nullable String data) {
Expand Down
4 changes: 2 additions & 2 deletions server/sonar-server/src/main/java/org/sonar/server/computation/measure/Measure.java
View file
Expand Up @@ -94,11 +94,11 @@ private Measure(ValueType valueType, @Nullable Integer ruleId, @Nullable Integer
this.variations = variations; this.variations = variations;
} }


public static NewMeasureBuilder newMeasure() { public static NewMeasureBuilder newMeasureBuilder() {
return new NewMeasureBuilder(); return new NewMeasureBuilder();
} }


public static UpdateMeasureBuilder updateMeasure(Measure measure) { public static UpdateMeasureBuilder updatedMeasureBuilder(Measure measure) {
return new UpdateMeasureBuilder(measure); return new UpdateMeasureBuilder(measure);
} }


Expand Down
14 changes: 7 additions & 7 deletions .../sonar-server/src/main/java/org/sonar/server/computation/measure/MeasureDtoToMeasure.java
View file
Expand Up @@ -65,35 +65,35 @@ private static Optional<Measure> toIntegerMeasure(MeasureDto measureDto, @Nullab
if (value == null) { if (value == null) {
return toNoValueMeasure(measureDto); return toNoValueMeasure(measureDto);
} }
return of(setCommonProperties(Measure.newMeasure(), measureDto).create(value.intValue(), data)); return of(setCommonProperties(Measure.newMeasureBuilder(), measureDto).create(value.intValue(), data));
} }


private static Optional<Measure> toLongMeasure(MeasureDto measureDto, @Nullable Double value, String data) { private static Optional<Measure> toLongMeasure(MeasureDto measureDto, @Nullable Double value, String data) {
if (value == null) { if (value == null) {
return toNoValueMeasure(measureDto); return toNoValueMeasure(measureDto);
} }
return of(setCommonProperties(Measure.newMeasure(), measureDto).create(value.longValue(), data)); return of(setCommonProperties(Measure.newMeasureBuilder(), measureDto).create(value.longValue(), data));
} }


private static Optional<Measure> toDoubleMeasure(MeasureDto measureDto, @Nullable Double value, String data) { private static Optional<Measure> toDoubleMeasure(MeasureDto measureDto, @Nullable Double value, String data) {
if (value == null) { if (value == null) {
return toNoValueMeasure(measureDto); return toNoValueMeasure(measureDto);
} }
return of(setCommonProperties(Measure.newMeasure(), measureDto).create(value.doubleValue(), data)); return of(setCommonProperties(Measure.newMeasureBuilder(), measureDto).create(value.doubleValue(), data));
} }


private static Optional<Measure> toBooleanMeasure(MeasureDto measureDto, @Nullable Double value, String data) { private static Optional<Measure> toBooleanMeasure(MeasureDto measureDto, @Nullable Double value, String data) {
if (value == null) { if (value == null) {
return toNoValueMeasure(measureDto); return toNoValueMeasure(measureDto);
} }
return of(setCommonProperties(Measure.newMeasure(), measureDto).create(value == 1.0d, data)); return of(setCommonProperties(Measure.newMeasureBuilder(), measureDto).create(value == 1.0d, data));
} }


private static Optional<Measure> toStringMeasure(MeasureDto measureDto, @Nullable String data) { private static Optional<Measure> toStringMeasure(MeasureDto measureDto, @Nullable String data) {
if (data == null) { if (data == null) {
return toNoValueMeasure(measureDto); return toNoValueMeasure(measureDto);
} }
return of(setCommonProperties(Measure.newMeasure(), measureDto).create(data)); return of(setCommonProperties(Measure.newMeasureBuilder(), measureDto).create(data));
} }


private static Optional<Measure> toLevelMeasure(MeasureDto measureDto, @Nullable String data) { private static Optional<Measure> toLevelMeasure(MeasureDto measureDto, @Nullable String data) {
Expand All @@ -104,11 +104,11 @@ private static Optional<Measure> toLevelMeasure(MeasureDto measureDto, @Nullable
if (!level.isPresent()) { if (!level.isPresent()) {
return toNoValueMeasure(measureDto); return toNoValueMeasure(measureDto);
} }
return of(setCommonProperties(Measure.newMeasure(), measureDto).create(level.get())); return of(setCommonProperties(Measure.newMeasureBuilder(), measureDto).create(level.get()));
} }


private static Optional<Measure> toNoValueMeasure(MeasureDto measureDto) { private static Optional<Measure> toNoValueMeasure(MeasureDto measureDto) {
return of(setCommonProperties(Measure.newMeasure(), measureDto).createNoValue()); return of(setCommonProperties(Measure.newMeasureBuilder(), measureDto).createNoValue());
} }


private static Measure.NewMeasureBuilder setCommonProperties(Measure.NewMeasureBuilder builder, MeasureDto measureDto) { private static Measure.NewMeasureBuilder setCommonProperties(Measure.NewMeasureBuilder builder, MeasureDto measureDto) {
Expand Down
26 changes: 13 additions & 13 deletions ...-server/src/test/java/org/sonar/server/computation/measure/MeasureRepositoryImplTest.java
View file
Expand Up @@ -74,7 +74,7 @@ public class MeasureRepositoryImplTest {
private static final long LAST_SNAPSHOT_ID = 123; private static final long LAST_SNAPSHOT_ID = 123;
private static final long OTHER_SNAPSHOT_ID = 369; private static final long OTHER_SNAPSHOT_ID = 369;
private static final long COMPONENT_ID = 567; private static final long COMPONENT_ID = 567;
private static final Measure SOME_MEASURE = Measure.newMeasure().create(Measure.Level.OK); private static final Measure SOME_MEASURE = Measure.newMeasureBuilder().create(Measure.Level.OK);
private static final String SOME_DATA = "some data"; private static final String SOME_DATA = "some data";
private static final RuleDto SOME_RULE = RuleDto.createFor(RuleKey.of("A", "1")).setId(963); private static final RuleDto SOME_RULE = RuleDto.createFor(RuleKey.of("A", "1")).setId(963);
private static final Characteristic SOME_CHARACTERISTIC = new Characteristic(741, "key"); private static final Characteristic SOME_CHARACTERISTIC = new Characteristic(741, "key");
Expand Down Expand Up @@ -206,7 +206,7 @@ public void update_supports_updating_to_the_same_value() {


@Test @Test
public void update_updates_the_stored_value() { public void update_updates_the_stored_value() {
Measure newMeasure = Measure.updateMeasure(SOME_MEASURE).create(); Measure newMeasure = Measure.updatedMeasureBuilder(SOME_MEASURE).create();


underTest.add(FILE_COMPONENT, metric1, SOME_MEASURE); underTest.add(FILE_COMPONENT, metric1, SOME_MEASURE);
underTest.update(FILE_COMPONENT, metric1, newMeasure); underTest.update(FILE_COMPONENT, metric1, newMeasure);
Expand All @@ -216,8 +216,8 @@ public void update_updates_the_stored_value() {


@Test @Test
public void update_updates_the_stored_value_for_rule() { public void update_updates_the_stored_value_for_rule() {
Measure initialMeasure = Measure.newMeasure().forRule(123).createNoValue(); Measure initialMeasure = Measure.newMeasureBuilder().forRule(123).createNoValue();
Measure newMeasure = Measure.updateMeasure(initialMeasure).create(); Measure newMeasure = Measure.updatedMeasureBuilder(initialMeasure).create();


underTest.add(FILE_COMPONENT, metric1, initialMeasure); underTest.add(FILE_COMPONENT, metric1, initialMeasure);
underTest.update(FILE_COMPONENT, metric1, newMeasure); underTest.update(FILE_COMPONENT, metric1, newMeasure);
Expand All @@ -227,8 +227,8 @@ public void update_updates_the_stored_value_for_rule() {


@Test @Test
public void update_updates_the_stored_value_for_characteristic() { public void update_updates_the_stored_value_for_characteristic() {
Measure initialMeasure = Measure.newMeasure().forCharacteristic(952).createNoValue(); Measure initialMeasure = Measure.newMeasureBuilder().forCharacteristic(952).createNoValue();
Measure newMeasure = Measure.updateMeasure(initialMeasure).create(); Measure newMeasure = Measure.updatedMeasureBuilder(initialMeasure).create();


underTest.add(FILE_COMPONENT, metric1, initialMeasure); underTest.add(FILE_COMPONENT, metric1, initialMeasure);
underTest.update(FILE_COMPONENT, metric1, newMeasure); underTest.update(FILE_COMPONENT, metric1, newMeasure);
Expand Down Expand Up @@ -311,7 +311,7 @@ public void getRawMeasure_retrieves_measure_from_batch_and_caches_it_locally_so_


Optional<Measure> measure = underTest.getRawMeasure(FILE_COMPONENT, metric1); Optional<Measure> measure = underTest.getRawMeasure(FILE_COMPONENT, metric1);


underTest.update(FILE_COMPONENT, metric1, Measure.updateMeasure(measure.get()).create()); underTest.update(FILE_COMPONENT, metric1, Measure.updatedMeasureBuilder(measure.get()).create());
} }


@Test(expected = NullPointerException.class) @Test(expected = NullPointerException.class)
Expand All @@ -336,10 +336,10 @@ public void getRawMeasure_for_rule_returns_absent_if_repository_is_empty() {


@Test @Test
public void getRawMeasure_for_rule_returns_measure_for_specified_rule() { public void getRawMeasure_for_rule_returns_measure_for_specified_rule() {
Measure measure = Measure.newMeasure().forRule(SOME_RULE.getId()).createNoValue(); Measure measure = Measure.newMeasureBuilder().forRule(SOME_RULE.getId()).createNoValue();


underTest.add(FILE_COMPONENT, metric1, measure); underTest.add(FILE_COMPONENT, metric1, measure);
underTest.add(FILE_COMPONENT, metric1, Measure.newMeasure().forRule(222).createNoValue()); underTest.add(FILE_COMPONENT, metric1, Measure.newMeasureBuilder().forRule(222).createNoValue());


assertThat(underTest.getRawMeasure(FILE_COMPONENT, metric1, SOME_RULE).get()).isSameAs(measure); assertThat(underTest.getRawMeasure(FILE_COMPONENT, metric1, SOME_RULE).get()).isSameAs(measure);
} }
Expand All @@ -366,10 +366,10 @@ public void getRawMeasure_for_characteristic_returns_absent_if_repository_is_emp


@Test @Test
public void getRawMeasure_for_characteristic_returns_measure_for_specified_rule() { public void getRawMeasure_for_characteristic_returns_measure_for_specified_rule() {
Measure measure = Measure.newMeasure().forCharacteristic(SOME_CHARACTERISTIC.getId()).createNoValue(); Measure measure = Measure.newMeasureBuilder().forCharacteristic(SOME_CHARACTERISTIC.getId()).createNoValue();


underTest.add(FILE_COMPONENT, metric1, measure); underTest.add(FILE_COMPONENT, metric1, measure);
underTest.add(FILE_COMPONENT, metric1, Measure.newMeasure().forCharacteristic(333).createNoValue()); underTest.add(FILE_COMPONENT, metric1, Measure.newMeasureBuilder().forCharacteristic(333).createNoValue());


assertThat(underTest.getRawMeasure(FILE_COMPONENT, metric1, SOME_CHARACTERISTIC).get()).isSameAs(measure); assertThat(underTest.getRawMeasure(FILE_COMPONENT, metric1, SOME_CHARACTERISTIC).get()).isSameAs(measure);
} }
Expand All @@ -382,14 +382,14 @@ public void getRawMeasures_returns_added_measures_over_batch_measures() {


Measure addedMeasure = SOME_MEASURE; Measure addedMeasure = SOME_MEASURE;
underTest.add(FILE_COMPONENT, metric1, addedMeasure); underTest.add(FILE_COMPONENT, metric1, addedMeasure);
Measure addedMeasure2 = Measure.newMeasure().forCharacteristic(SOME_CHARACTERISTIC.getId()).createNoValue(); Measure addedMeasure2 = Measure.newMeasureBuilder().forCharacteristic(SOME_CHARACTERISTIC.getId()).createNoValue();
underTest.add(FILE_COMPONENT, metric1, addedMeasure2); underTest.add(FILE_COMPONENT, metric1, addedMeasure2);


SetMultimap<String, Measure> rawMeasures = underTest.getRawMeasures(FILE_COMPONENT); SetMultimap<String, Measure> rawMeasures = underTest.getRawMeasures(FILE_COMPONENT);


assertThat(rawMeasures.keySet()).hasSize(2); assertThat(rawMeasures.keySet()).hasSize(2);
assertThat(rawMeasures.get(METRIC_KEY_1)).containsOnly(addedMeasure, addedMeasure2); assertThat(rawMeasures.get(METRIC_KEY_1)).containsOnly(addedMeasure, addedMeasure2);
assertThat(rawMeasures.get(METRIC_KEY_2)).containsOnly(Measure.newMeasure().create("some value")); assertThat(rawMeasures.get(METRIC_KEY_2)).containsOnly(Measure.newMeasureBuilder().create("some value"));
} }


private static MeasureDto createMeasureDto(int metricId, long snapshotId) { private static MeasureDto createMeasureDto(int metricId, long snapshotId) {
Expand Down

0 comments on commit 424cd7b

Please sign in to comment.