SONAR-5313 Return long name in /api/components/app

diff --git a/sonar-server/src/main/java/org/sonar/server/component/ws/ComponentAppAction.java b/sonar-server/src/main/java/org/sonar/server/component/ws/ComponentAppAction.java
index 99ad639104314bcfc79c6f20c1bb73bb0b7098f8..e73451be671b8bf990ab7ce6dfa7923186c08884 100644 (file)
--- a/sonar-server/src/main/java/org/sonar/server/component/ws/ComponentAppAction.java
+++ b/sonar-server/src/main/java/org/sonar/server/component/ws/ComponentAppAction.java
@@ -168,6 +168,7 @@ public class ComponentAppAction implements RequestHandler {
     json.prop("key", component.key());
     json.prop("path", component.path());
     json.prop("name", component.name());
+    json.prop("longName", component.longName());
     json.prop("q", component.qualifier());
 
     ComponentDto subProject = (ComponentDto) nullableComponentById(component.subProjectId(), session);

diff --git a/sonar-server/src/main/java/org/sonar/server/ui/JRubyI18n.java b/sonar-server/src/main/java/org/sonar/server/ui/JRubyI18n.java
index 3fe51df9928fb4d252db8e91ad497507e3891585..65935833d6ac371a0cfba34194f89bca14cb80f3 100644 (file)
--- a/sonar-server/src/main/java/org/sonar/server/ui/JRubyI18n.java
+++ b/sonar-server/src/main/java/org/sonar/server/ui/JRubyI18n.java
@@ -35,6 +35,8 @@ import java.util.Locale;
 import java.util.Map;
 
 /**
+ * Used through ruby code <pre>Internal.i18n</pre>
+ *
  * Bridge between JRuby webapp and Java I18n component
  */
 public class JRubyI18n implements ServerComponent {

diff --git a/sonar-server/src/main/resources/org/sonar/server/component/ws/components-example-app.json b/sonar-server/src/main/resources/org/sonar/server/component/ws/components-example-app.json
index 2d7477b7b3cf9f805fc4623cf2f07bbbf1ff0b30..a04bad19e9d90b5939650ec8f581513c5bfa3844 100644 (file)
--- a/sonar-server/src/main/resources/org/sonar/server/component/ws/components-example-app.json
+++ b/sonar-server/src/main/resources/org/sonar/server/component/ws/components-example-app.json
@@ -1,5 +1,6 @@
 {
   "key": "org.codehaus.sonar:sonar-plugin-api:src/main/java/org/sonar/api/Plugin.java",
+  "longName": "src/main/java/org/sonar/api/Plugin.java",
   "path": "src/main/java/org/sonar/api/Plugin.java",
   "name": "Plugin.java",
   "q": "FIL",

diff --git a/sonar-server/src/test/java/org/sonar/server/component/ws/ComponentAppActionTest.java b/sonar-server/src/test/java/org/sonar/server/component/ws/ComponentAppActionTest.java
index 81fd5aaac2ec5d7c1a3f374fe69e8000d3936d12..13ebf05e6d543273c99ec712a226af8fd04c4103 100644 (file)
--- a/sonar-server/src/test/java/org/sonar/server/component/ws/ComponentAppActionTest.java
+++ b/sonar-server/src/test/java/org/sonar/server/component/ws/ComponentAppActionTest.java
@@ -146,6 +146,7 @@ public class ComponentAppActionTest {
     MockUserSession.set().setLogin("john").addComponentPermission(UserRole.USER, SUB_PROJECT_KEY, COMPONENT_KEY);
 
     ComponentDto file = new ComponentDto().setId(10L).setQualifier("FIL").setKey(COMPONENT_KEY).setName("Plugin.java")
+      .setLongName("src/main/java/org/sonar/api/Plugin.java")
       .setPath("src/main/java/org/sonar/api/Plugin.java").setSubProjectId(5L).setProjectId(1L);
     when(componentDao.getNullableByKey(session, COMPONENT_KEY)).thenReturn(file);
     when(componentDao.getById(5L, session)).thenReturn(new ComponentDto().setId(5L).setLongName("SonarQube :: Plugin API").setKey(SUB_PROJECT_KEY));
@@ -437,6 +438,7 @@ public class ComponentAppActionTest {
 
   private void addComponent() {
     ComponentDto file = new ComponentDto().setId(10L).setQualifier("FIL").setKey(COMPONENT_KEY).setName("Plugin.java")
+      .setLongName("src/main/java/org/sonar/api/Plugin.java")
       .setPath("src/main/java/org/sonar/api/Plugin.java").setSubProjectId(5L).setProjectId(1L);
     when(componentDao.getNullableByKey(session, COMPONENT_KEY)).thenReturn(file);
     when(componentDao.getById(5L, session)).thenReturn(new ComponentDto().setId(5L).setLongName("SonarQube :: Plugin API").setKey(SUB_PROJECT_KEY));

diff --git a/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app.json b/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app.json
index 0bc7b8dda36d3f752298bbe01b7dcb418144f321..46ae3cd3d859b84bbac212cfaa5936d75a53268c 100644 (file)
--- a/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app.json
+++ b/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app.json
@@ -1,5 +1,6 @@
 {
   "key": "org.codehaus.sonar:sonar-plugin-api:src/main/java/org/sonar/api/Plugin.java",
+  "longName": "src/main/java/org/sonar/api/Plugin.java",
   "path": "src/main/java/org/sonar/api/Plugin.java",
   "name": "Plugin.java",
   "q": "FIL",

diff --git a/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_extension.json b/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_extension.json
index e91a1bb424c0c69e8e62f7c3a32c26637e78a6c6..c0b27c2ef04ee442e829174ef257ccd13034c84e 100644 (file)
--- a/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_extension.json
+++ b/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_extension.json
@@ -1,5 +1,6 @@
 {
   "key": "org.codehaus.sonar:sonar-plugin-api:src/main/java/org/sonar/api/Plugin.java",
+  "longName": "src/main/java/org/sonar/api/Plugin.java",
   "path": "src/main/java/org/sonar/api/Plugin.java",
   "name": "Plugin.java",
   "q": "FIL",

diff --git a/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_extension_having_permission.json b/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_extension_having_permission.json
index c2ea499f5868db28f3245d57961b92ef80acea68..6d72995e309232ab492ecfb9a4ff0b5bfbf6ffec 100644 (file)
--- a/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_extension_having_permission.json
+++ b/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_extension_having_permission.json
@@ -1,5 +1,6 @@
 {
   "key": "org.codehaus.sonar:sonar-plugin-api:src/main/java/org/sonar/api/Plugin.java",
+  "longName": "src/main/java/org/sonar/api/Plugin.java",
   "path": "src/main/java/org/sonar/api/Plugin.java",
   "name": "Plugin.java",
   "q": "FIL",

diff --git a/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_issues_measures.json b/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_issues_measures.json
index cbc1c3f8fe9d90c9f23e393f0eec4b6f3ad08e92..6e688c0dc306bb8a8107cd341a479463cc6ba44a 100644 (file)
--- a/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_issues_measures.json
+++ b/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_issues_measures.json
@@ -1,5 +1,6 @@
 {
   "key": "org.codehaus.sonar:sonar-plugin-api:src/main/java/org/sonar/api/Plugin.java",
+  "longName": "src/main/java/org/sonar/api/Plugin.java",
   "path": "src/main/java/org/sonar/api/Plugin.java",
   "name": "Plugin.java",
   "q": "FIL",

diff --git a/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_issues_measures_when_period_is_set.json b/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_issues_measures_when_period_is_set.json
index ade74eae2dd1d0fd5e3a08837d587b2afb85f55f..dcd1868611994d2829a80fd6e7443cab0155ee95 100644 (file)
--- a/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_issues_measures_when_period_is_set.json
+++ b/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_issues_measures_when_period_is_set.json
@@ -1,5 +1,6 @@
 {
   "key": "org.codehaus.sonar:sonar-plugin-api:src/main/java/org/sonar/api/Plugin.java",
+  "longName": "src/main/java/org/sonar/api/Plugin.java",
   "path": "src/main/java/org/sonar/api/Plugin.java",
   "name": "Plugin.java",
   "q": "FIL",

diff --git a/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_manual_rules.json b/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_manual_rules.json
index f75d151934651fe3da216bfac2a2075bc53b6895..d70a86c1e395b21883d71efebb89a8877843cd51 100644 (file)
--- a/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_manual_rules.json
+++ b/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_manual_rules.json
@@ -1,5 +1,6 @@
 {
   "key": "org.codehaus.sonar:sonar-plugin-api:src/main/java/org/sonar/api/Plugin.java",
+  "longName": "src/main/java/org/sonar/api/Plugin.java",
   "path": "src/main/java/org/sonar/api/Plugin.java",
   "name": "Plugin.java",
   "q": "FIL",

diff --git a/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_measures.json b/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_measures.json
index 83d040a36829102cf40ee27284920f638148bac8..8f26dd9621c1c381db8b2deb406b9e9871f59d5f 100644 (file)
--- a/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_measures.json
+++ b/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_measures.json
@@ -1,5 +1,6 @@
 {
   "key": "org.codehaus.sonar:sonar-plugin-api:src/main/java/org/sonar/api/Plugin.java",
+  "longName": "src/main/java/org/sonar/api/Plugin.java",
   "path": "src/main/java/org/sonar/api/Plugin.java",
   "name": "Plugin.java",
   "q": "FIL",

diff --git a/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_measures_when_period_is_set.json b/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_measures_when_period_is_set.json
index 60e51356b2c278ae3f49af6fbe1a9c3580624b1c..cce534b0462d1d69e9252eaf0d1b99e53c90085e 100644 (file)
--- a/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_measures_when_period_is_set.json
+++ b/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_measures_when_period_is_set.json
@@ -1,5 +1,6 @@
 {
   "key": "org.codehaus.sonar:sonar-plugin-api:src/main/java/org/sonar/api/Plugin.java",
+  "longName": "src/main/java/org/sonar/api/Plugin.java",
   "path": "src/main/java/org/sonar/api/Plugin.java",
   "name": "Plugin.java",
   "q": "FIL",

diff --git a/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_periods.json b/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_periods.json
index 474d13fb1ecf1cfbd02678c67a708fd67552678d..90ff42e90a0853d02358091b2fdad0ecb033fd66 100644 (file)
--- a/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_periods.json
+++ b/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_periods.json
@@ -1,5 +1,6 @@
 {
   "key": "org.codehaus.sonar:sonar-plugin-api:src/main/java/org/sonar/api/Plugin.java",
+  "longName": "src/main/java/org/sonar/api/Plugin.java",
   "path": "src/main/java/org/sonar/api/Plugin.java",
   "name": "Plugin.java",
   "q": "FIL",

diff --git a/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_rules.json b/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_rules.json
index e745fe5b119b960e7086d39b12119e7e5e856bf2..69a3163fddb39119ea41b32442d523fad444a8cd 100644 (file)
--- a/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_rules.json
+++ b/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_rules.json
@@ -1,5 +1,6 @@
 {
   "key": "org.codehaus.sonar:sonar-plugin-api:src/main/java/org/sonar/api/Plugin.java",
+  "longName": "src/main/java/org/sonar/api/Plugin.java",
   "path": "src/main/java/org/sonar/api/Plugin.java",
   "name": "Plugin.java",
   "q": "FIL",

diff --git a/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_rules_when_period_is_set.json b/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_rules_when_period_is_set.json
index 65ac58302ffd1288523ca366069543325e2bce70..9bcea6b06518d1b6ca2a029794ab2ebe74473e81 100644 (file)
--- a/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_rules_when_period_is_set.json
+++ b/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_rules_when_period_is_set.json
@@ -1,5 +1,6 @@
 {
   "key": "org.codehaus.sonar:sonar-plugin-api:src/main/java/org/sonar/api/Plugin.java",
+  "longName": "src/main/java/org/sonar/api/Plugin.java",
   "path": "src/main/java/org/sonar/api/Plugin.java",
   "name": "Plugin.java",
   "q": "FIL",

diff --git a/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_severities.json b/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_severities.json
index b490b411ef66d250e7bac422673081f08edf6038..55a6f96ed74a47f607c7e488d1a5a043d5d01dfb 100644 (file)
--- a/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_severities.json
+++ b/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_severities.json
@@ -1,5 +1,6 @@
 {
   "key": "org.codehaus.sonar:sonar-plugin-api:src/main/java/org/sonar/api/Plugin.java",
+  "longName": "src/main/java/org/sonar/api/Plugin.java",
   "path": "src/main/java/org/sonar/api/Plugin.java",
   "name": "Plugin.java",
   "q": "FIL",

diff --git a/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_severities_when_period_is_set.json b/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_severities_when_period_is_set.json
index d98a9f3634d064bce199e5f41fba63a5659d82ba..567ee9c2c6bbf856c57ab96a3810d59edf1624ad 100644 (file)
--- a/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_severities_when_period_is_set.json
+++ b/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_severities_when_period_is_set.json
@@ -1,5 +1,6 @@
 {
   "key": "org.codehaus.sonar:sonar-plugin-api:src/main/java/org/sonar/api/Plugin.java",
+  "longName": "src/main/java/org/sonar/api/Plugin.java",
   "path": "src/main/java/org/sonar/api/Plugin.java",
   "name": "Plugin.java",
   "q": "FIL",

diff --git a/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_tabs.json b/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_tabs.json
index 3009fb3d416542d8a043a71e49fce858e28f9ef7..3288f4217abef4298b1be0c39b807f53a5f7edfb 100644 (file)
--- a/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_tabs.json
+++ b/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_tabs.json
@@ -1,5 +1,6 @@
 {
   "key": "org.codehaus.sonar:sonar-plugin-api:src/main/java/org/sonar/api/Plugin.java",
+  "longName": "src/main/java/org/sonar/api/Plugin.java",
   "path": "src/main/java/org/sonar/api/Plugin.java",
   "name": "Plugin.java",
   "q": "FIL",