SONAR-6427 Fix WS example & response

diff --git a/server/sonar-server/src/main/java/org/sonar/server/ui/ws/GlobalNavigationAction.java b/server/sonar-server/src/main/java/org/sonar/server/ui/ws/GlobalNavigationAction.java
index 30a795d4ac1d3a3cff01222b64fc5f8bf0762b90..3647510ccb0480c968373075495ccb4bc3e86473 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/ui/ws/GlobalNavigationAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/ui/ws/GlobalNavigationAction.java
@@ -107,7 +107,7 @@ public class GlobalNavigationAction implements NavigationAction {
   }
 
   private void writeQualifiers(JsonWriter json) {
-    json.name("rootQualifiers").beginArray();
+    json.name("qualifiers").beginArray();
     for (ResourceType rootType : resourceTypes.getRoots()) {
       json.value(rootType.getQualifier());
     }

diff --git a/server/sonar-server/src/main/resources/org/sonar/server/ui/ws/example-global.json b/server/sonar-server/src/main/resources/org/sonar/server/ui/ws/example-global.json
index 1a01e276e07c7c40fbcdbd41e24fc9176fa89df3..44dcbd3e24c2a5e7efdcdeab4228d7ffddb78bae 100644 (file)
--- a/server/sonar-server/src/main/resources/org/sonar/server/ui/ws/example-global.json
+++ b/server/sonar-server/src/main/resources/org/sonar/server/ui/ws/example-global.json
@@ -12,5 +12,6 @@
     }
   ],
   "logoUrl": "http://example.com/my-custom-logo.png",
-  "logoWidth": 135
+  "logoWidth": 135,
+  "qualifiers": ["TRK", "VW"]
 }

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/GlobalNavigationActionTest/with_qualifiers.json b/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/GlobalNavigationActionTest/with_qualifiers.json
index 3f3ca07ceaf2713d1d625d503ce4758b34a46842..c585eb266ed8ec903c30978c47a2fe921ecd3eb6 100644 (file)
--- a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/GlobalNavigationActionTest/with_qualifiers.json
+++ b/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/GlobalNavigationActionTest/with_qualifiers.json
@@ -1,5 +1,5 @@
 {
   "globalDashboards": [],
   "globalPages": [],
-  "rootQualifiers": ["POL", "PAL"]
+  "qualifiers": ["POL", "PAL"]
 }