From: Julien Lancelot <julien.lancelot@sonarsource.com>
Date: Thu, 5 Mar 2015 11:30:34 +0000 (+0100)
Subject: SONAR-6214 Document parameter 's' of api/users/search
X-Git-Tag: 5.2-RC1~2658
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fpull%2F133%2Fhead;p=sonarqube.git

SONAR-6214 Document parameter 's' of api/users/search
---

diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/ws/UsersWs.java b/server/sonar-server/src/main/java/org/sonar/server/user/ws/UsersWs.java
index 4a44637627c..6677468eac5 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/user/ws/UsersWs.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/user/ws/UsersWs.java
@@ -64,6 +64,10 @@ public class UsersWs implements WebService {
       .setDescription("Comma-separated list of user logins")
       .setExampleValue("admin,sbrandhof");
 
+    action.createParam("s")
+      .setDescription("UTF-8 search query on login or name")
+      .setExampleValue("bran");
+
     RailsHandler.addFormatParam(action);
   }
 
diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/ws/UsersWsTest.java b/server/sonar-server/src/test/java/org/sonar/server/user/ws/UsersWsTest.java
index 4a0b093b327..259d7473904 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/user/ws/UsersWsTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/user/ws/UsersWsTest.java
@@ -56,7 +56,7 @@ public class UsersWsTest {
     assertThat(action.isPost()).isFalse();
     assertThat(action.handler()).isInstanceOf(RailsHandler.class);
     assertThat(action.responseExampleAsString()).isNotEmpty();
-    assertThat(action.params()).hasSize(3);
+    assertThat(action.params()).hasSize(4);
   }
 
   @Test