From cfb0894291c0f8884530c6ea8f7287bcfb20e09f Mon Sep 17 00:00:00 2001
From: Teryk Bellahsene <teryk.bellahsene@sonarsource.com>
Date: Wed, 15 Feb 2017 11:48:04 +0100
Subject: [PATCH] SONAR-8793 Return deprecated key and its version in
 api/webservices/list

---
 .../src/main/java/org/sonar/server/ws/ws/ListAction.java      | 2 ++
 .../main/resources/org/sonar/server/ws/ws/list-example.json   | 2 ++
 .../test/java/org/sonar/server/ws/ws/WebServicesWsTest.java   | 4 +++-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/server/sonar-server/src/main/java/org/sonar/server/ws/ws/ListAction.java b/server/sonar-server/src/main/java/org/sonar/server/ws/ws/ListAction.java
index 0b776e62094..76b9e53679f 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/ws/ws/ListAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/ws/ws/ListAction.java
@@ -124,6 +124,8 @@ public class ListAction implements WebServicesWsAction {
     writer.prop("defaultValue", param.defaultValue());
     writer.prop("exampleValue", param.exampleValue());
     writer.prop("deprecatedSince", param.deprecatedSince());
+    writer.prop("deprecatedKey", param.deprecatedKey());
+    writer.prop("deprecatedKeySince", param.deprecatedKeySince());
     Set<String> possibleValues = param.possibleValues();
     if (possibleValues != null) {
       writer.name("possibleValues").beginArray().values(possibleValues).endArray();
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/ws/ws/list-example.json b/server/sonar-server/src/main/resources/org/sonar/server/ws/ws/list-example.json
index d5c306ba39f..481f2641c33 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/ws/ws/list-example.json
+++ b/server/sonar-server/src/main/resources/org/sonar/server/ws/ws/list-example.json
@@ -28,6 +28,8 @@
               "exampleValue": "INFO",
               "since": "4.4",
               "deprecatedSince": "5.2",
+              "deprecatedKey": "old_severity",
+              "deprecatedKeySince": "4.6",
               "possibleValues": [
                 "BLOCKER",
                 "INFO"
diff --git a/server/sonar-server/src/test/java/org/sonar/server/ws/ws/WebServicesWsTest.java b/server/sonar-server/src/test/java/org/sonar/server/ws/ws/WebServicesWsTest.java
index 110d356cc54..4f6cc3a237c 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/ws/ws/WebServicesWsTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/ws/ws/WebServicesWsTest.java
@@ -81,7 +81,7 @@ public class WebServicesWsTest {
       .execute().assertJson(getClass(), "response_example.json");
   }
 
-  static class MetricWs implements WebService {
+  private static class MetricWs implements WebService {
     @Override
     public void define(Context context) {
       NewController newController = context
@@ -106,11 +106,13 @@ public class WebServicesWsTest {
         .setResponseExample(Resources.getResource(getClass(), "WebServicesWsTest/metrics_example.json"))
         .setHandler((request, response) -> {
         });
+
       create
         .createParam("severity")
         .setDescription("Severity")
         .setSince("4.4")
         .setDeprecatedSince("5.2")
+        .setDeprecatedKey("old_severity", "4.6")
         .setRequired(false)
         .setPossibleValues("BLOCKER", "INFO")
         .setExampleValue("INFO")
-- 
2.39.5