From 130ba20d9acf5b7af45823f598f2f784afb27876 Mon Sep 17 00:00:00 2001 From: Teryk Bellahsene Date: Wed, 19 Aug 2015 16:08:39 +0200 Subject: [PATCH] SONAR-6485 ws permissions/search_project_permissions update the search query parameter --- .../server/permission/ws/SearchProjectPermissionsAction.java | 2 +- .../src/main/java/org/sonar/api/server/ws/WebService.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/SearchProjectPermissionsAction.java b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/SearchProjectPermissionsAction.java index d55be8594f3..1e9dcbc7e78 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/SearchProjectPermissionsAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/SearchProjectPermissionsAction.java @@ -68,7 +68,7 @@ public class SearchProjectPermissionsAction implements PermissionsWsAction { .setResponseExample(getClass().getResource("search_project_permissions-example.json")) .setSince("5.2") .addPagingParams(25) - .addSearchQuery("sonarq", "names", "keys") + .addSearchQuery("sonarq", "project names", "project keys") .setHandler(this); createProjectUuidParameter(action); diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/server/ws/WebService.java b/sonar-plugin-api/src/main/java/org/sonar/api/server/ws/WebService.java index e6b049ed4fe..d6a22bd65ba 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/server/ws/WebService.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/server/ws/WebService.java @@ -373,7 +373,7 @@ public interface WebService extends Definable { * The fields must be in the plural form (ex: "names", "keys") */ public NewAction addSearchQuery(String exampleValue, String... pluralFields) { - String actionDescription = String.format("Searches for %s containing the supplied string.", Joiner.on(" and ").join(pluralFields)); + String actionDescription = String.format("Limit search to %s that contain the supplied string.", Joiner.on(" or ").join(pluralFields)); createParam(Param.TEXT_QUERY) .setDescription(actionDescription) .setExampleValue(exampleValue); -- 2.39.5