Return information on groupId and rootId on issue WS

3 files changed, 38 insertions, 8 deletions

diff --git a/sonar-ws-client/src/main/java/org/sonar/wsclient/component/Component.java b/sonar-ws-client/src/main/java/org/sonar/wsclient/component/Component.java
index 9b5f5431c6e..29680c2d21b 100644
--- a/sonar-ws-client/src/main/java/org/sonar/wsclient/component/Component.java
+++ b/sonar-ws-client/src/main/java/org/sonar/wsclient/component/Component.java
@@ -43,25 +43,49 @@ public class Component {
   /**
    * @since 4.2
    */
+  public Long id() {
+    return JsonUtils.getLong(json, "id");
+  }
+
+  public String name() {
+    return JsonUtils.getString(json, "name");
+  }
+
   @CheckForNull
-  public String path() {
-    return JsonUtils.getString(json, "path");
+  public String longName() {
+    return JsonUtils.getString(json, "longName");
   }
 
   /**
    * @since 4.2
    */
   @CheckForNull
-  public String moduleKey() {
-    return JsonUtils.getString(json, "moduleKey");
+  public Long groupId() {
+    return JsonUtils.getLong(json, "groupId");
   }
 
-  public String name() {
-    return JsonUtils.getString(json, "name");
+  /**
+   * @since 4.2
+   */
+  @CheckForNull
+  public Long rootId() {
+    return JsonUtils.getLong(json, "rootId");
   }
 
+  /**
+   * @since 4.2
+   */
   @CheckForNull
-  public String longName() {
-    return JsonUtils.getString(json, "longName");
+  public String path() {
+    return JsonUtils.getString(json, "path");
   }
+
+  /**
+   * @since 4.2
+   */
+  @CheckForNull
+  public String moduleKey() {
+    return JsonUtils.getString(json, "moduleKey");
+  }
+
 }
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 f330e782faa..5f0c825ca50 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,8 @@ public interface Issue {
 
   String componentKey();
 
+  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 a0744230d47..75c1d776925 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
@@ -50,6 +50,10 @@ public class DefaultIssue implements Issue {
     return JsonUtils.getString(json, "component");
   }
 
+  public Long componentId() {
+    return JsonUtils.getLong(json, "componentId");
+  }
+
   public String projectKey() {
     return JsonUtils.getString(json, "project");
   }