From: Teryk Bellahsene <teryk.bellahsene@sonarsource.com>
Date: Wed, 30 Aug 2017 09:57:40 +0000 (+0200)
Subject: Explicit difference between api/projects/search and api/components/search
X-Git-Tag: 6.6-RC1~420
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=71140666ff0e26cc77ac42e27e8badbc4fff8893;p=sonarqube.git

Explicit difference between api/projects/search and api/components/search
---

diff --git a/server/sonar-server/src/main/java/org/sonar/server/component/ws/SearchAction.java b/server/sonar-server/src/main/java/org/sonar/server/component/ws/SearchAction.java
index d5bca61331e..33e706ee1ba 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/component/ws/SearchAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/component/ws/SearchAction.java
@@ -80,8 +80,7 @@ public class SearchAction implements ComponentsWsAction {
   public void define(WebService.NewController context) {
     WebService.NewAction action = context.createAction(ACTION_SEARCH)
       .setSince("6.3")
-      .setDescription("Search for components.<br>" +
-        "Returns the components with the 'Browse' permission.")
+      .setDescription("Search for components")
       .addPagingParams(100)
       .addSearchQuery("sona", "component names", "component keys")
       .setResponseExample(getClass().getResource("search-components-example.json"))
diff --git a/server/sonar-server/src/main/java/org/sonar/server/project/ws/SearchAction.java b/server/sonar-server/src/main/java/org/sonar/server/project/ws/SearchAction.java
index db5a30ff61a..e801645689c 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/project/ws/SearchAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/project/ws/SearchAction.java
@@ -73,7 +73,7 @@ public class SearchAction implements ProjectsWsAction {
   public void define(WebService.NewController context) {
     WebService.NewAction action = context.createAction(ACTION_SEARCH)
       .setSince("6.3")
-      .setDescription("Search for projects or views.<br>" +
+      .setDescription("Search for projects or views to administrate them.<br>" +
         "Requires 'System Administrator' permission")
       .setInternal(true)
       .addPagingParams(100, MAX_PAGE_SIZE)
diff --git a/server/sonar-server/src/test/java/org/sonar/server/project/ws/SearchActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/project/ws/SearchActionTest.java
index 658e15e48af..356e9cf9033 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/project/ws/SearchActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/project/ws/SearchActionTest.java
@@ -247,7 +247,7 @@ public class SearchActionTest {
     WebService.Action action = ws.getDef();
     assertThat(action.key()).isEqualTo("search");
     assertThat(action.isPost()).isFalse();
-    assertThat(action.description()).isEqualTo("Search for projects or views.<br>Requires 'System Administrator' permission");
+    assertThat(action.description()).isEqualTo("Search for projects or views to administrate them.<br>Requires 'System Administrator' permission");
     assertThat(action.isInternal()).isTrue();
     assertThat(action.since()).isEqualTo("6.3");
     assertThat(action.handler()).isEqualTo(ws.getDef().handler());