diff options
| author | Teryk Bellahsene <teryk.bellahsene@sonarsource.com> | 2017-03-01 12:18:05 +0100 |
|---|---|---|
| committer | Teryk Bellahsene <teryk.bellahsene@sonarsource.com> | 2017-03-02 09:14:22 +0100 |
| commit | 5330045e891686e824eb88924d4b5fa33130abd9 (patch) | |
| tree | 189c2d2bd9299f39038c4bba232912a03891078f /server | |
| parent | 17c0b638ccf1279e2066236fad2a119c4a1e3f62 (diff) | |
| download | sonarqube-5330045e891686e824eb88924d4b5fa33130abd9.tar.gz sonarqube-5330045e891686e824eb88924d4b5fa33130abd9.zip | |
SONAR-8842 Add tags to WS api/components/search_projects
Diffstat (limited to 'server')
3 files changed, 20 insertions, 5 deletions
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 ef0ebc991a7..b5749087c02 100644 --- 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 7a37aabb71b..6bcd6669b3c 100644 --- 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 7e44228fe57..48f9e835d0f 100644 --- 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(); |