SONAR-5872 Add module key in api/issues/show

diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/IssueShowAction.java b/server/sonar-server/src/main/java/org/sonar/server/issue/ws/IssueShowAction.java
index 1480ff0de016bc1d3c5dac9a48bd9e6dd57dc223..a057ead4ff07f14b86fd739229176b6e64ae3c72 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/IssueShowAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/issue/ws/IssueShowAction.java
@@ -174,6 +174,7 @@ public class IssueShowAction implements RequestHandler {
     String projectName = project.longName() != null ? project.longName() : project.name();
     // Do not display sub project long name if sub project and project are the same
     boolean displaySubProjectLongName = subProject != null && !subProject.getId().equals(project.getId());
+    String subProjectKey = displaySubProjectLongName ? subProject.key() : null;
     String subProjectName = displaySubProjectLongName ? subProject.longName() != null ? subProject.longName() : subProject.name() : null;
 
     json
@@ -183,6 +184,7 @@ public class IssueShowAction implements RequestHandler {
       .prop("componentEnabled", component.isEnabled())
       .prop("project", project.key())
       .prop("projectName", projectName)
+      .prop("subProject", subProjectKey)
       .prop("subProjectName", subProjectName);
   }
 

diff --git a/server/sonar-server/src/main/resources/org/sonar/server/issue/ws/example-show.json b/server/sonar-server/src/main/resources/org/sonar/server/issue/ws/example-show.json
index f0a4edc287c355ed4ac96419dc56643e0becbae7..d3afe4ca45a0dfde39f71632b730d3c91cfd9e13 100644 (file)
--- a/server/sonar-server/src/main/resources/org/sonar/server/issue/ws/example-show.json
+++ b/server/sonar-server/src/main/resources/org/sonar/server/issue/ws/example-show.json
@@ -19,6 +19,7 @@
     "componentQualifier": "FIL",
     "project": "com.sonarsource.cobol:cobol",
     "projectName": "SonarSource :: Cobol",
+    "subProject": "com.sonarsource.cobol:cobol-preprocessor"
     "subProjectName": "SonarSource :: Cobol :: Preprocessor",
     "subCharacteristic": "Readability",
     "characteristic": "Maintainability",

diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/IssueShowActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/IssueShowActionTest.java
index b27b078c31797df8d2f834776ac784e5a5dffe7c..2a52d832206d663f4c418203d42b91b967640a81 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/IssueShowActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/IssueShowActionTest.java
@@ -390,7 +390,6 @@ public class IssueShowActionTest {
 
     MockUserSession.set();
     WsTester.TestRequest request = tester.newGetRequest("api/issues", "show").setParam("key", issue.key());
-    System.out.println("request.execute().outputAsString() = " + request.execute().outputAsString());
     request.execute().assertJson(getClass(), "show_issue_with_characteristics.json");
   }
 

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowActionTest/show_issue_with_sub_project.json b/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowActionTest/show_issue_with_sub_project.json
index a4546b2ee566c81541099568ab2f5d6795a11b53..3222be95688b56857cef3303bfe5230259a090a6 100644 (file)
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowActionTest/show_issue_with_sub_project.json
+++ b/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowActionTest/show_issue_with_sub_project.json
@@ -7,6 +7,7 @@
     "componentEnabled": true,
     "project": "org.sonar.Sonar",
     "projectName": "SonarQube",
+    "subProject": "org.sonar.server.Server",
     "subProjectName": "SonarQube :: Server",
     "rule": "squid:AvoidCycle",
     "ruleName": "Avoid cycle",