SONAR-11570 Add period back to QG conditions recomputed on UI change

diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/measure/qualitygatedetails/QualityGateDetailsDataTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/measure/qualitygatedetails/QualityGateDetailsDataTest.java
index 5a91b986a0231cccda28802688abbb73a2136872..5b27ad8aeeeaa92ae35c4c90a00e4a61d1717d5d 100644 (file)
--- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/measure/qualitygatedetails/QualityGateDetailsDataTest.java
+++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/measure/qualitygatedetails/QualityGateDetailsDataTest.java
@@ -79,6 +79,38 @@ public class QualityGateDetailsDataTest {
       "}");
   }
 
+  @Test
+  public void verify_json_for_condition_on_leak_metric() {
+    String value = "actualValue";
+    Condition condition = new Condition(new MetricImpl(1, "new_key1", "name1", Metric.MetricType.STRING), Condition.Operator.GREATER_THAN.getDbValue(), "errorTh");
+    ImmutableList<EvaluatedCondition> evaluatedConditions = ImmutableList.of(
+      new EvaluatedCondition(condition, Measure.Level.OK, value),
+      new EvaluatedCondition(condition, Measure.Level.ERROR, value));
+    String actualJson = new QualityGateDetailsData(Measure.Level.OK, evaluatedConditions, false).toJson();
+
+    JsonAssert.assertJson(actualJson).isSimilarTo("{" +
+      "\"level\":\"OK\"," +
+      "\"conditions\":[" +
+      "  {" +
+      "    \"metric\":\"new_key1\"," +
+      "    \"op\":\"GT\"," +
+      "    \"error\":\"errorTh\"," +
+      "    \"actual\":\"actualValue\"," +
+      "    \"period\":1," +
+      "    \"level\":\"OK\"" +
+      "  }," +
+      "  {" +
+      "    \"metric\":\"new_key1\"," +
+      "    \"op\":\"GT\"," +
+      "    \"error\":\"errorTh\"," +
+      "    \"actual\":\"actualValue\"," +
+      "    \"period\":1," +
+      "    \"level\":\"ERROR\"" +
+      "  }" +
+      "]" +
+      "}");
+  }
+
   @Test
   public void verify_json_for_small_leak() {
     String actualJson = new QualityGateDetailsData(Measure.Level.OK, Collections.emptyList(), false).toJson();

diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/QualityGateConverter.java b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/QualityGateConverter.java
index 402c9bfed54b802808669abb760fc416eef8ead8..8ed1b406c62a277321de473c91a57b883c11ee59 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/QualityGateConverter.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/QualityGateConverter.java
@@ -49,6 +49,9 @@ public class QualityGateConverter {
     JsonObject result = new JsonObject();
     result.addProperty("metric", condition.getMetricKey());
     result.addProperty("op", condition.getOperator().getDbValue());
+    if (condition.isOnLeakPeriod()) {
+      result.addProperty("period", 1);
+    }
     result.addProperty("error", condition.getErrorThreshold());
     evaluatedCondition.getValue().ifPresent(v -> result.addProperty("actual", v));
     result.addProperty(FIELD_LEVEL, evaluatedCondition.getStatus().name());