SONAR-5341 Restore issue.componentId in order to be able to use SonarQube 3.7 Java Client

5 files changed, 13 insertions, 0 deletions

diff --git a/sonar-server/src/main/java/org/sonar/server/issue/ws/IssueSearchAction.java b/sonar-server/src/main/java/org/sonar/server/issue/ws/IssueSearchAction.java
index cc3d84fdcd9..dc6aa1ac7a4 100644
--- a/sonar-server/src/main/java/org/sonar/server/issue/ws/IssueSearchAction.java
+++ b/sonar-server/src/main/java/org/sonar/server/issue/ws/IssueSearchAction.java
@@ -204,6 +204,7 @@ public class IssueSearchAction implements RequestHandler {
       json
         .prop("key", issue.key())
         .prop("component", issue.componentKey())
+        .prop("componentId", issue.componentId())
         .prop("project", issue.projectKey())
         .prop("rule", issue.ruleKey().toString())
         .prop("status", issue.status())
diff --git a/sonar-server/src/test/java/org/sonar/server/issue/ws/IssueSearchActionTest.java b/sonar-server/src/test/java/org/sonar/server/issue/ws/IssueSearchActionTest.java
index 714b63fb9d6..2c989d64533 100644
--- a/sonar-server/src/test/java/org/sonar/server/issue/ws/IssueSearchActionTest.java
+++ b/sonar-server/src/test/java/org/sonar/server/issue/ws/IssueSearchActionTest.java
@@ -109,6 +109,7 @@ public class IssueSearchActionTest {
     Issue issue = new DefaultIssue()
       .setKey(issueKey)
       .setComponentKey("sample:src/main/xoo/sample/Sample.xoo")
+      .setComponentId(5L)
       .setProjectKey("sample")
       .setRuleKey(RuleKey.of("squid", "AvoidCycle"))
       .setActionPlanKey("AP-ABCD")
diff --git a/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueSearchActionTest/issues.json b/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueSearchActionTest/issues.json
index 8d14e1cd9b4..b809ccb6100 100644
--- a/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueSearchActionTest/issues.json
+++ b/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueSearchActionTest/issues.json
@@ -11,6 +11,7 @@
     {
       "key": "ABCD",
       "component": "sample:src/main/xoo/sample/Sample.xoo",
+      "componentId": 5,
       "project": "sample",
       "rule": "squid:AvoidCycle",
       "resolution": "FIXED",
diff --git a/sonar-ws-client/src/main/java/org/sonar/wsclient/issue/Issue.java b/sonar-ws-client/src/main/java/org/sonar/wsclient/issue/Issue.java
index 6a9d8477490..6e4c6da2b55 100644
--- a/sonar-ws-client/src/main/java/org/sonar/wsclient/issue/Issue.java
+++ b/sonar-ws-client/src/main/java/org/sonar/wsclient/issue/Issue.java
@@ -37,6 +37,12 @@ public interface Issue {
 
   String componentKey();
 
+  /**
+   * Deprecated since 4.4
+   */
+  @Deprecated
+  Long componentId();
+
   String projectKey();
 
   String ruleKey();
diff --git a/sonar-ws-client/src/main/java/org/sonar/wsclient/issue/internal/DefaultIssue.java b/sonar-ws-client/src/main/java/org/sonar/wsclient/issue/internal/DefaultIssue.java
index eadf2b9f1ee..a86f9e35cbd 100644
--- a/sonar-ws-client/src/main/java/org/sonar/wsclient/issue/internal/DefaultIssue.java
+++ b/sonar-ws-client/src/main/java/org/sonar/wsclient/issue/internal/DefaultIssue.java
@@ -45,6 +45,10 @@ public class DefaultIssue implements Issue {
     return JsonUtils.getString(json, "key");
   }
 
+  public Long componentId() {
+    return JsonUtils.getLong(json, "componentId");
+  }
+
   public String componentKey() {
     return JsonUtils.getString(json, "component");
   }