SONAR-6275 Add temporary field person_id on measure to keep devcockpi…

…t working
SonarSource · Mar 24, 2015 · 290f7c4 · 290f7c4
1 parent 631cea2
commit 290f7c4
Show file tree

Hide file tree

Showing 12 changed files with 849 additions and 638 deletions.
diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistMeasuresStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistMeasuresStep.java
@@ -117,6 +117,7 @@ MeasureDto toMeasureDto(BatchReport.Measure in, BatchReport.Component component)
     out.setMetricId(metricCache.get(in.getMetricKey()).getId());
     out.setRuleId(in.hasRuleKey() ? ruleCache.get(RuleKey.parse(in.getRuleKey())).getId() : null);
     out.setCharacteristicId(in.hasCharactericId() ? in.getCharactericId() : null);
+    out.setPersonId(in.hasPersonId() ? in.getPersonId() : null);
     out.setValue(valueAsDouble(in));
     setData(in, out);
     return out;

diff --git a/...sonar-server/src/test/java/org/sonar/server/computation/step/PersistMeasuresStepTest.java b/...sonar-server/src/test/java/org/sonar/server/computation/step/PersistMeasuresStepTest.java
@@ -178,6 +178,7 @@ public void map_full_batch_measure() throws Exception {
       .setMetricKey("metric-key")
       .setRuleKey("repo:rule-key")
       .setCharactericId(123456)
+      .setPersonId(5432)
       .build();
 
     MeasureDto measure = sut.toMeasureDto(batchMeasure, component);
@@ -321,6 +322,7 @@ private MeasureDto expectedFullMeasure() {
       .setComponentId(2L)
       .setSnapshotId(3L)
       .setCharacteristicId(123456)
+      .setPersonId(5432)
       .setValue(123.123d)
       .setTendency(2)
       .setVariation(1, 1.1d)

diff --git a/server/sonar-server/src/test/java/org/sonar/server/measure/persistence/MeasureDaoTest.java b/server/sonar-server/src/test/java/org/sonar/server/measure/persistence/MeasureDaoTest.java
@@ -141,6 +141,7 @@ public void insert() throws Exception {
       .setSnapshotId(2L)
       .setMetricId(3)
       .setCharacteristicId(4)
+      .setPersonId(23)
       .setRuleId(5)
       .setComponentId(6L)
       .setValue(2.0d)

diff --git a/.../src/test/resources/org/sonar/server/measure/persistence/MeasureDaoTest/insert-result.xml b/.../src/test/resources/org/sonar/server/measure/persistence/MeasureDaoTest/insert-result.xml
@@ -6,7 +6,7 @@
       characteristic_id="4"
       rule_id="5"
       project_id="6"
-      person_id="[null]"
+      person_id="23"
       value="2.0"
       text_value="measure-value"
       tendency="42"

diff --git a/sonar-batch-protocol/src/main/gen-java/org/sonar/batch/protocol/Constants.java b/sonar-batch-protocol/src/main/gen-java/org/sonar/batch/protocol/Constants.java