aboutsummaryrefslogtreecommitdiffstats
path: root/server/sonar-server
diff options
context:
space:
mode:
authorJulien HENRY <julien.henry@sonarsource.com>2015-03-24 10:16:03 +0100
committerJulien HENRY <julien.henry@sonarsource.com>2015-03-24 10:16:36 +0100
commit290f7c401b1c349a11c50c17f5c867009077f543 (patch)
tree06cf8c2f972d66d2043fe6f99d20c5f7df94d238 /server/sonar-server
parent631cea2c6bf952460e5239c2862c43d22edf529b (diff)
downloadsonarqube-290f7c401b1c349a11c50c17f5c867009077f543.tar.gz
sonarqube-290f7c401b1c349a11c50c17f5c867009077f543.zip
SONAR-6275 Add temporary field person_id on measure to keep devcockpit working
Diffstat (limited to 'server/sonar-server')
-rw-r--r--server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistMeasuresStep.java1
-rw-r--r--server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistMeasuresStepTest.java2
-rw-r--r--server/sonar-server/src/test/java/org/sonar/server/measure/persistence/MeasureDaoTest.java1
-rw-r--r--server/sonar-server/src/test/resources/org/sonar/server/measure/persistence/MeasureDaoTest/insert-result.xml2
4 files changed, 5 insertions, 1 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
index 4c10a8be07d..1e775f705c3 100644
--- 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 @@ public class PersistMeasuresStep implements ComputationStep {
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/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistMeasuresStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistMeasuresStepTest.java
index 1925596643d..cba0cf1a85e 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistMeasuresStepTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistMeasuresStepTest.java
@@ -178,6 +178,7 @@ public class PersistMeasuresStepTest extends BaseStepTest {
.setMetricKey("metric-key")
.setRuleKey("repo:rule-key")
.setCharactericId(123456)
+ .setPersonId(5432)
.build();
MeasureDto measure = sut.toMeasureDto(batchMeasure, component);
@@ -321,6 +322,7 @@ public class PersistMeasuresStepTest extends BaseStepTest {
.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
index d37060f1b1a..910f0b6ff26 100644
--- 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 class MeasureDaoTest {
.setSnapshotId(2L)
.setMetricId(3)
.setCharacteristicId(4)
+ .setPersonId(23)
.setRuleId(5)
.setComponentId(6L)
.setValue(2.0d)
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/measure/persistence/MeasureDaoTest/insert-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/measure/persistence/MeasureDaoTest/insert-result.xml
index 6714a2ad41c..62b7c66cac3 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/measure/persistence/MeasureDaoTest/insert-result.xml
+++ b/server/sonar-server/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"