SONAR-6485 ws permissions/search_project_permissions update the search query parameter

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 d55be8594f3dbe091e373bcd4bcc3975382daf55..1e9dcbc7e78273cbedbf4bf4dc77ac0541577f77 100644 (file)
--- 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 e6b049ed4feca76ef7c21c8425bdd10c5987aa46..d6a22bd65ba5a7738fc9f4b36c8fbb63513eceda 100644 (file)
--- 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<WebService.Context> {
      * The fields must be in the <strong>plural</strong> 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);