From 0ea6171344366a1931296cd2c86ba3832c660d6b Mon Sep 17 00:00:00 2001 From: Julien Lancelot Date: Thu, 23 Jan 2014 14:21:16 +0100 Subject: [PATCH] IssueShowWS : Add component long name and qualifier, add project long name --- .../sonar/server/issue/ws/IssueShowWsHandler.java | 3 +++ .../server/issue/ws/IssueShowWsHandlerTest.java | 12 ++++++++++-- .../issue/ws/IssueShowWsHandlerTest/show_issue.json | 3 +++ .../show_issue_with_action_plan.json | 3 +++ .../show_issue_with_actions.json | 3 +++ .../show_issue_with_actions_defined_by_plugins.json | 3 +++ .../show_issue_with_assign_to_me_action.json | 3 +++ .../show_issue_with_changelog.json | 3 +++ .../show_issue_with_comments.json | 3 +++ .../show_issue_with_dates.json | 3 +++ .../show_issue_with_severity_action.json | 3 +++ .../show_issue_with_technical_debt.json | 3 +++ .../show_issue_with_transitions.json | 3 +++ .../show_issue_with_users.json | 3 +++ .../show_issue_without_assign_to_me_action.json | 3 +++ 15 files changed, 52 insertions(+), 2 deletions(-) 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 c7c5df9e7e3..16b9a2fa2e4 100644 --- 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 c0041331d3e..3cc36fca58c 100644 --- 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(); 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 83dfdb018fe..08bddf8422e 100644 --- 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 618350122be..dc9d14e6222 100644 --- 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 6db96acf677..ddf54a26eda 100644 --- 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 ff007387484..38fd6674cb8 100644 --- 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 6db96acf677..ddf54a26eda 100644 --- 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 c17f85153f1..8fdcbc1145f 100644 --- 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 0018368eb78..df246f1698e 100644 --- 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 2acfa022389..eff1d105933 100644 --- 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 56d968f7682..6fbed895643 100644 --- 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 93d228b17fe..a65353a2264 100644 --- 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 df575c0fa9f..84b3f02ab4e 100644 --- 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 9554a79702e..0585eef171b 100644 --- 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 fc42c4420a3..fefb526ccd3 100644 --- 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", -- 2.39.5