SONAR-8613 add organization to response of 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 a561acd6518366b7df2710edba13a5559f9cf5ca..be55889f348977e173df90d47b4614aaf8b85522 100644 (file)
--- 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
@@ -161,6 +161,7 @@ public class SearchAction implements ComponentsWsAction {
     @Override
     public WsComponents.Component apply(@Nonnull ComponentDto dto) {
       WsComponents.Component.Builder builder = WsComponents.Component.newBuilder()
+        .setOrganization(dto.getOrganizationKey())
         .setId(dto.uuid())
         .setKey(dto.key())
         .setName(dto.name())

diff --git a/server/sonar-server/src/main/resources/org/sonar/server/component/ws/search-components-example.json b/server/sonar-server/src/main/resources/org/sonar/server/component/ws/search-components-example.json
index 1053ac8d311c16225eebfc90c0dd057aca278c7b..dafce93382832c6fb9fa17daf68c886d06e36377 100644 (file)
--- a/server/sonar-server/src/main/resources/org/sonar/server/component/ws/search-components-example.json
+++ b/server/sonar-server/src/main/resources/org/sonar/server/component/ws/search-components-example.json
@@ -6,12 +6,14 @@
   },
   "components": [
     {
+      "organization": "my-org-1",
       "id": "directory-uuid",
       "key": "directory-key",
       "qualifier": "DIR",
       "name": "Directory Name"
     },
     {
+      "organization": "my-org-1",
       "id": "file-uuid",
       "key": "file-key",
       "qualifier": "FIL",
@@ -19,12 +21,14 @@
       "language": "java"
     },
     {
+      "organization": "my-org-1",
       "id": "module-uuid",
       "key": "module-key",
       "qualifier": "BRC",
       "name": "Module Name"
     },
     {
+      "organization": "my-org-1",
       "id": "project-uuid",
       "key": "project-key",
       "qualifier": "TRK",

diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/ws/SearchActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/component/ws/SearchActionTest.java
index aa9d539bbc4d68290fe90b6b5b26712e9ef2dfb5..4d7cf68a8b2237c62f059815065207d19075e169 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/component/ws/SearchActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/component/ws/SearchActionTest.java
@@ -84,7 +84,7 @@ public class SearchActionTest {
 
   @Test
   public void search_json_example() {
-    OrganizationDto organizationDto = db.organizations().insert();
+    OrganizationDto organizationDto = db.organizations().insertForKey("my-org-1");
     componentDb.insertComponent(newView(organizationDto));
     ComponentDto project = componentDb.insertComponent(
       newProjectDto(organizationDto, "project-uuid")