SONAR-8842 Add tags to WS api/components/search_projects

diff --git a/server/sonar-server/src/main/java/org/sonar/server/component/ws/SearchProjectsAction.java b/server/sonar-server/src/main/java/org/sonar/server/component/ws/SearchProjectsAction.java
index ef0ebc991a79205365f149103e43fc559413aaeb..b5749087c02e8d9cc00a4dae9be4083d58768c22 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/component/ws/SearchProjectsAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/component/ws/SearchProjectsAction.java
@@ -388,6 +388,7 @@ public class SearchProjectsAction implements ComponentsWsAction {
         .setId(dbComponent.uuid())
         .setKey(dbComponent.key())
         .setName(dbComponent.name());
+      wsComponent.getTagsBuilder().addAllTags(dbComponent.getTags());
 
       SnapshotDto snapshotDto = analysisByProjectUuid.get(dbComponent.uuid());
       if (snapshotDto != null) {

diff --git a/server/sonar-server/src/main/resources/org/sonar/server/component/ws/search_projects-example.json b/server/sonar-server/src/main/resources/org/sonar/server/component/ws/search_projects-example.json
index 7a37aabb71b3673add8fa0540e77bd320f639caa..6bcd6669b3cdc7a7428312ec0c0172040c45a5fa 100644 (file)
--- a/server/sonar-server/src/main/resources/org/sonar/server/component/ws/search_projects-example.json
+++ b/server/sonar-server/src/main/resources/org/sonar/server/component/ws/search_projects-example.json
@@ -10,21 +10,31 @@
       "id": "AU-Tpxb--iU5OvuD2FLy",
       "key": "my_project",
       "name": "My Project 1",
-      "isFavorite": true
+      "isFavorite": true,
+      "tags": [
+        "finance",
+        "java"
+      ]
     },
     {
       "organization": "my-org-key-1",
       "id": "AU-TpxcA-iU5OvuD2FLz",
       "key": "another_project",
       "name": "My Project 2",
-      "isFavorite": false
+      "isFavorite": false,
+      "tags": []
     },
     {
       "organization": "my-org-key-2",
       "id": "AU-TpxcA-iU5OvuD2FL0",
       "key": "third_project",
       "name": "My Project 3",
-      "isFavorite": false
+      "isFavorite": false,
+      "tags": [
+        "sales",
+        "offshore",
+        "java"
+      ]
     }
   ]
 }

diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/ws/SearchProjectsActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/component/ws/SearchProjectsActionTest.java
index 7e44228fe57f6d62d3413055971f0469156de6ce..48f9e835d0fe91a65cd9bfa4d3a11e8ec5441861 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/component/ws/SearchProjectsActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/component/ws/SearchProjectsActionTest.java
@@ -159,7 +159,9 @@ public class SearchProjectsActionTest {
     ComponentDto project1 = insertProjectInDbAndEs(newProjectDto(organization1Dto)
       .setUuid(Uuids.UUID_EXAMPLE_01)
       .setKey(KeyExamples.KEY_PROJECT_EXAMPLE_001)
-      .setName("My Project 1"));
+      .setName("My Project 1")
+      .setTagsString("finance, java")
+    );
     insertProjectInDbAndEs(newProjectDto(organization1Dto)
       .setUuid(Uuids.UUID_EXAMPLE_02)
       .setKey(KeyExamples.KEY_PROJECT_EXAMPLE_002)
@@ -167,7 +169,9 @@ public class SearchProjectsActionTest {
     insertProjectInDbAndEs(newProjectDto(organization2Dto)
       .setUuid(Uuids.UUID_EXAMPLE_03)
       .setKey(KeyExamples.KEY_PROJECT_EXAMPLE_003)
-      .setName("My Project 3"));
+      .setName("My Project 3")
+      .setTagsString("sales, offshore, java")
+    );
     userSession.logIn().setUserId(23);
     addFavourite(project1);
     dbSession.commit();