From d14403162522261ca8d2a2e4b3d966629d7e4a0d Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Lievremont Date: Thu, 30 Apr 2015 09:56:08 +0200 Subject: [PATCH] SONAR-6427 Fix WS example & response --- .../java/org/sonar/server/ui/ws/GlobalNavigationAction.java | 2 +- .../main/resources/org/sonar/server/ui/ws/example-global.json | 3 ++- .../ui/ws/GlobalNavigationActionTest/with_qualifiers.json | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) 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 30a795d4ac1..3647510ccb0 100644 --- 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 1a01e276e07..44dcbd3e24c 100644 --- 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 3f3ca07ceaf..c585eb266ed 100644 --- 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"] } -- 2.39.5