IssueShowWS : Add component long name and qualifier, add project long name

diff --git a/sonar-server/src/main/java/org/sonar/server/issue/ws/IssueShowWsHandler.java b/sonar-server/src/main/java/org/sonar/server/issue/ws/IssueShowWsHandler.java
index c7c5df9e7e328c0279f8f39d82c716b70ac2b639..16b9a2fa2e49afa98be5d9006c9b91512364b406 100644 (file)
--- a/sonar-server/src/main/java/org/sonar/server/issue/ws/IssueShowWsHandler.java
+++ b/sonar-server/src/main/java/org/sonar/server/issue/ws/IssueShowWsHandler.java
@@ -93,7 +93,10 @@ public class IssueShowWsHandler implements RequestHandler {
     json
       .prop("key", issue.key())
       .prop("component", issue.componentKey())
+      .prop("componentLongName", result.component(issue).longName())
+      .prop("componentQualifier", result.component(issue).qualifier())
       .prop("project", result.project(issue).key())
+      .prop("projectLongName", result.project(issue).longName())
       .prop("rule", issue.ruleKey().toString())
       .prop("ruleName", result.rule(issue).getName())
       .prop("line", issue.line())

diff --git a/sonar-server/src/test/java/org/sonar/server/issue/ws/IssueShowWsHandlerTest.java b/sonar-server/src/test/java/org/sonar/server/issue/ws/IssueShowWsHandlerTest.java
index c0041331d3e514b96ef5083f756c1a860c25971d..3cc36fca58c3826f85c4c7be5df786338519c3b1 100644 (file)
--- a/sonar-server/src/test/java/org/sonar/server/issue/ws/IssueShowWsHandlerTest.java
+++ b/sonar-server/src/test/java/org/sonar/server/issue/ws/IssueShowWsHandlerTest.java
@@ -91,9 +91,17 @@ public class IssueShowWsHandlerTest {
   public void setUp() throws Exception {
     issues = new ArrayList<Issue>();
     result = new DefaultIssueQueryResult(issues);
+
     Component component = mock(Component.class);
-    when(component.key()).thenReturn("org.sonar.Sonar");
-    result.addProjects(newArrayList(component));
+    when(component.key()).thenReturn("org.sonar.server.issue.IssueClient");
+    when(component.longName()).thenReturn("SonarQube :: Issue Client");
+    when(component.qualifier()).thenReturn("FIL");
+    result.addComponents(newArrayList(component));
+    Component project = mock(Component.class);
+    when(project.key()).thenReturn("org.sonar.Sonar");
+    when(project.longName()).thenReturn("SonarQube");
+    result.addProjects(newArrayList(project));
+
     result.addRules(newArrayList(Rule.create("squid", "AvoidCycle").setName("Avoid cycle")));
     when(issueFinder.find(any(IssueQuery.class))).thenReturn(result);
 

diff --git a/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowWsHandlerTest/show_issue.json b/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowWsHandlerTest/show_issue.json
index 83dfdb018fee2643f3240739feba1158dacd6134..08bddf8422eb43622acf301e0b4cf0a5de7dc68a 100644 (file)
--- a/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowWsHandlerTest/show_issue.json
+++ b/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowWsHandlerTest/show_issue.json
@@ -2,7 +2,10 @@
   "issue": {
     "key": "ABCD",
     "component": "org.sonar.server.issue.IssueClient",
+    "componentLongName": "SonarQube :: Issue Client",
+    "componentQualifier": "FIL",
     "project": "org.sonar.Sonar",
+    "projectLongName": "SonarQube",
     "rule": "squid:AvoidCycle",
     "ruleName": "Avoid cycle",
     "line": 12,

diff --git a/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowWsHandlerTest/show_issue_with_action_plan.json b/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowWsHandlerTest/show_issue_with_action_plan.json
index 618350122beb32f3d1bc741bb3c287ff52fce818..dc9d14e6222747ba672d1f4e5b534a623634dfeb 100644 (file)
--- a/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowWsHandlerTest/show_issue_with_action_plan.json
+++ b/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowWsHandlerTest/show_issue_with_action_plan.json
@@ -2,7 +2,10 @@
   "issue": {
     "key": "ABCD",
     "component": "org.sonar.server.issue.IssueClient",
+    "componentLongName": "SonarQube :: Issue Client",
+    "componentQualifier": "FIL",
     "project": "org.sonar.Sonar",
+    "projectLongName": "SonarQube",
     "rule": "squid:AvoidCycle",
     "ruleName": "Avoid cycle",
     "actionPlan" : "AP-ABCD",

diff --git a/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowWsHandlerTest/show_issue_with_actions.json b/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowWsHandlerTest/show_issue_with_actions.json
index 6db96acf67753b9d3e7b796331f84b8e8d986e86..ddf54a26edacbfe944019308be68d3929b1bee16 100644 (file)
--- a/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowWsHandlerTest/show_issue_with_actions.json
+++ b/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowWsHandlerTest/show_issue_with_actions.json
@@ -2,7 +2,10 @@
   "issue": {
     "key": "ABCD",
     "component": "org.sonar.server.issue.IssueClient",
+    "componentLongName": "SonarQube :: Issue Client",
+    "componentQualifier": "FIL",
     "project": "org.sonar.Sonar",
+    "projectLongName": "SonarQube",
     "rule": "squid:AvoidCycle",
     "ruleName": "Avoid cycle",
     "status": "OPEN",

diff --git a/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowWsHandlerTest/show_issue_with_actions_defined_by_plugins.json b/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowWsHandlerTest/show_issue_with_actions_defined_by_plugins.json
index ff0073874848903a25cf25608cfd517f2d4e77bb..38fd6674cb8420ed446997609a14d1f9f677a3a0 100644 (file)
--- a/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowWsHandlerTest/show_issue_with_actions_defined_by_plugins.json
+++ b/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowWsHandlerTest/show_issue_with_actions_defined_by_plugins.json
@@ -2,7 +2,10 @@
   "issue": {
     "key": "ABCD",
     "component": "org.sonar.server.issue.IssueClient",
+    "componentLongName": "SonarQube :: Issue Client",
+    "componentQualifier": "FIL",
     "project": "org.sonar.Sonar",
+    "projectLongName": "SonarQube",
     "rule": "squid:AvoidCycle",
     "ruleName": "Avoid cycle",
     "status": "OPEN",

diff --git a/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowWsHandlerTest/show_issue_with_assign_to_me_action.json b/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowWsHandlerTest/show_issue_with_assign_to_me_action.json
index 6db96acf67753b9d3e7b796331f84b8e8d986e86..ddf54a26edacbfe944019308be68d3929b1bee16 100644 (file)
--- a/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowWsHandlerTest/show_issue_with_assign_to_me_action.json
+++ b/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowWsHandlerTest/show_issue_with_assign_to_me_action.json
@@ -2,7 +2,10 @@
   "issue": {
     "key": "ABCD",
     "component": "org.sonar.server.issue.IssueClient",
+    "componentLongName": "SonarQube :: Issue Client",
+    "componentQualifier": "FIL",
     "project": "org.sonar.Sonar",
+    "projectLongName": "SonarQube",
     "rule": "squid:AvoidCycle",
     "ruleName": "Avoid cycle",
     "status": "OPEN",

diff --git a/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowWsHandlerTest/show_issue_with_changelog.json b/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowWsHandlerTest/show_issue_with_changelog.json
index c17f85153f1d8a8e1c32a7056153c5e57c25a38d..8fdcbc1145fdc6372a357b20f301fdf7db512e8b 100644 (file)
--- a/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowWsHandlerTest/show_issue_with_changelog.json
+++ b/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowWsHandlerTest/show_issue_with_changelog.json
@@ -2,7 +2,10 @@
   "issue": {
     "key": "ABCD",
     "component": "org.sonar.server.issue.IssueClient",
+    "componentLongName": "SonarQube :: Issue Client",
+    "componentQualifier": "FIL",
     "project": "org.sonar.Sonar",
+    "projectLongName": "SonarQube",
     "rule": "squid:AvoidCycle",
     "ruleName": "Avoid cycle",
     "creationDate": "2014-01-22T19:10:03+0100",

diff --git a/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowWsHandlerTest/show_issue_with_comments.json b/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowWsHandlerTest/show_issue_with_comments.json
index 0018368eb785a9ec9a17965b31317c5f2a9fd08d..df246f1698ec2ec177e82e3507cfb7981a3be055 100644 (file)
--- a/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowWsHandlerTest/show_issue_with_comments.json
+++ b/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowWsHandlerTest/show_issue_with_comments.json
@@ -2,7 +2,10 @@
   "issue": {
     "key": "ABCD",
     "component": "org.sonar.server.issue.IssueClient",
+    "componentLongName": "SonarQube :: Issue Client",
+    "componentQualifier": "FIL",
     "project": "org.sonar.Sonar",
+    "projectLongName": "SonarQube",
     "rule": "squid:AvoidCycle",
     "ruleName": "Avoid cycle",
     "creationDate": "2014-01-22T19:10:03+0100",

diff --git a/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowWsHandlerTest/show_issue_with_dates.json b/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowWsHandlerTest/show_issue_with_dates.json
index 2acfa022389f901cc21433f592a6a02572de7b93..eff1d1059336a503047d8bc7a0afc269c3ecb761 100644 (file)
--- a/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowWsHandlerTest/show_issue_with_dates.json
+++ b/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowWsHandlerTest/show_issue_with_dates.json
@@ -2,7 +2,10 @@
   "issue": {
     "key": "ABCD",
     "component": "org.sonar.server.issue.IssueClient",
+    "componentLongName": "SonarQube :: Issue Client",
+    "componentQualifier": "FIL",
     "project": "org.sonar.Sonar",
+    "projectLongName": "SonarQube",
     "rule": "squid:AvoidCycle",
     "ruleName": "Avoid cycle",
     "creationDate": "2014-01-22T19:10:03+0100",

diff --git a/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowWsHandlerTest/show_issue_with_severity_action.json b/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowWsHandlerTest/show_issue_with_severity_action.json
index 56d968f7682db1f83a6ed3f21aa600c37385db50..6fbed895643db6d81f5a4d7a94be2f36e8cd5b67 100644 (file)
--- a/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowWsHandlerTest/show_issue_with_severity_action.json
+++ b/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowWsHandlerTest/show_issue_with_severity_action.json
@@ -2,7 +2,10 @@
   "issue": {
     "key": "ABCD",
     "component": "org.sonar.server.issue.IssueClient",
+    "componentLongName": "SonarQube :: Issue Client",
+    "componentQualifier": "FIL",
     "project": "org.sonar.Sonar",
+    "projectLongName": "SonarQube",
     "rule": "squid:AvoidCycle",
     "ruleName": "Avoid cycle",
     "status": "OPEN",

diff --git a/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowWsHandlerTest/show_issue_with_technical_debt.json b/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowWsHandlerTest/show_issue_with_technical_debt.json
index 93d228b17fea2c02f4f2b8bb33a76abf26fae7d5..a65353a2264dd1895c71c8873afefd9882c2b956 100644 (file)
--- a/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowWsHandlerTest/show_issue_with_technical_debt.json
+++ b/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowWsHandlerTest/show_issue_with_technical_debt.json
@@ -2,7 +2,10 @@
   "issue": {
     "key": "ABCD",
     "component": "org.sonar.server.issue.IssueClient",
+    "componentLongName": "SonarQube :: Issue Client",
+    "componentQualifier": "FIL",
     "project": "org.sonar.Sonar",
+    "projectLongName": "SonarQube",
     "rule": "squid:AvoidCycle",
     "ruleName": "Avoid cycle",
     "debt": "2 hours 1 minutes",

diff --git a/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowWsHandlerTest/show_issue_with_transitions.json b/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowWsHandlerTest/show_issue_with_transitions.json
index df575c0fa9f9b4cfb812a2d95c52cf259857127a..84b3f02ab4e7d598a7c68eecbf4a2c0baff4bc3a 100644 (file)
--- a/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowWsHandlerTest/show_issue_with_transitions.json
+++ b/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowWsHandlerTest/show_issue_with_transitions.json
@@ -2,7 +2,10 @@
   "issue": {
     "key": "ABCD",
     "component": "org.sonar.server.issue.IssueClient",
+    "componentLongName": "SonarQube :: Issue Client",
+    "componentQualifier": "FIL",
     "project": "org.sonar.Sonar",
+    "projectLongName": "SonarQube",
     "rule": "squid:AvoidCycle",
     "ruleName": "Avoid cycle",
     "status": "RESOLVED",

diff --git a/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowWsHandlerTest/show_issue_with_users.json b/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowWsHandlerTest/show_issue_with_users.json
index 9554a79702e7875280a36c5f547729e0b1c3b4aa..0585eef171b521833aee776628f395ec12c4de0f 100644 (file)
--- a/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowWsHandlerTest/show_issue_with_users.json
+++ b/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowWsHandlerTest/show_issue_with_users.json
@@ -2,7 +2,10 @@
   "issue": {
     "key": "ABCD",
     "component": "org.sonar.server.issue.IssueClient",
+    "componentLongName": "SonarQube :: Issue Client",
+    "componentQualifier": "FIL",
     "project": "org.sonar.Sonar",
+    "projectLongName": "SonarQube",
     "rule": "squid:AvoidCycle",
     "ruleName": "Avoid cycle",
     "assignee": "john",

diff --git a/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowWsHandlerTest/show_issue_without_assign_to_me_action.json b/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowWsHandlerTest/show_issue_without_assign_to_me_action.json
index fc42c4420a330223b08cef91dc282cb40b0cf275..fefb526ccd37469412f7e62a88cae7bcc590b5e5 100644 (file)
--- a/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowWsHandlerTest/show_issue_without_assign_to_me_action.json
+++ b/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowWsHandlerTest/show_issue_without_assign_to_me_action.json
@@ -2,7 +2,10 @@
   "issue": {
     "key": "ABCD",
     "component": "org.sonar.server.issue.IssueClient",
+    "componentLongName": "SonarQube :: Issue Client",
+    "componentQualifier": "FIL",
     "project": "org.sonar.Sonar",
+    "projectLongName": "SonarQube",
     "rule": "squid:AvoidCycle",
     "ruleName": "Avoid cycle",
     "assignee": "john",