From: Jean-Baptiste Lievremont <jean-baptiste.lievremont@sonarsource.com>
Date: Tue, 25 Nov 2014 08:53:57 +0000 (+0100)
Subject: SONAR-5872 Add module key in api/issues/show
X-Git-Tag: 5.0-RC1~226
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=a2d4db6fedfe509875a489fbe97a734cc53b2c7e;p=sonarqube.git

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 1480ff0de01..a057ead4ff0 100644
--- 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 f0a4edc287c..d3afe4ca45a 100644
--- 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 b27b078c317..2a52d832206 100644
--- 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 a4546b2ee56..3222be95688 100644
--- 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",