SONAR-8617 add organization to api/navigation/component response

diff --git a/server/sonar-server/src/main/java/org/sonar/server/ui/ws/ComponentAction.java b/server/sonar-server/src/main/java/org/sonar/server/ui/ws/ComponentAction.java
index ffdb67f07349571779ac93071363debd5c825afe..de2a87197b9badbe551509a3d1899d1615459c49 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/ui/ws/ComponentAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/ui/ws/ComponentAction.java
@@ -17,7 +17,6 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-
 package org.sonar.server.ui.ws;
 
 import com.google.common.collect.Lists;
@@ -149,6 +148,7 @@ public class ComponentAction implements NavigationWsAction {
 
   private void writeComponent(JsonWriter json, DbSession session, ComponentDto component, @Nullable SnapshotDto analysis) {
     json.prop("key", component.key())
+      .prop("organization", component.getOrganizationKey())
       .prop("id", component.uuid())
       .prop("name", component.name())
       .prop("description", component.description())

diff --git a/server/sonar-server/src/main/resources/org/sonar/server/ui/ws/component-example.json b/server/sonar-server/src/main/resources/org/sonar/server/ui/ws/component-example.json
index e797d034d47187acb6d6e29672ff5a199c4c7811..b9275d0bd223e7c78b068f32c47989e8803ba662 100644 (file)
--- a/server/sonar-server/src/main/resources/org/sonar/server/ui/ws/component-example.json
+++ b/server/sonar-server/src/main/resources/org/sonar/server/ui/ws/component-example.json
@@ -1,4 +1,5 @@
 {
+  "organization": "my-org-1",
   "key": "org.codehaus.sonar:sonar",
   "id": "ABCD",
   "name": "Sonarqube",

diff --git a/server/sonar-server/src/test/java/org/sonar/server/ui/ws/ComponentActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/ui/ws/ComponentActionTest.java
index bd47de25716199a898c6fad528d7eb1f3a2e6995..e349965caba1fc0b13e4efa308484114bc73d0d6 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/ui/ws/ComponentActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/ui/ws/ComponentActionTest.java
@@ -42,6 +42,7 @@ import org.sonar.db.component.ComponentDbTester;
 import org.sonar.db.component.ComponentDto;
 import org.sonar.db.component.SnapshotDto;
 import org.sonar.db.metric.MetricDto;
+import org.sonar.db.organization.OrganizationDto;
 import org.sonar.db.property.PropertyDbTester;
 import org.sonar.db.property.PropertyDto;
 import org.sonar.db.qualitygate.QualityGateDto;
@@ -106,7 +107,8 @@ public class ComponentActionTest {
 
   @Before
   public void before() {
-    project =  newProjectDto(dbTester.getDefaultOrganization(), "abcd")
+    OrganizationDto organization = dbTester.organizations().insertForKey("my-org");
+    project =  newProjectDto(organization, "abcd")
         .setKey(PROJECT_KEY)
         .setName("Polop")
         .setDescription("test project")
@@ -340,7 +342,8 @@ public class ComponentActionTest {
   @Test
   public void test_example_response() throws Exception {
     init(createPages());
-    ComponentDto project = newProjectDto(dbTester.getDefaultOrganization(), "ABCD")
+    OrganizationDto organizationDto = dbTester.organizations().insertForKey("my-org-1");
+    ComponentDto project = newProjectDto(organizationDto, "ABCD")
       .setKey("org.codehaus.sonar:sonar")
       .setName("Sonarqube")
       .setDescription("Open source platform for continuous inspection of code quality");

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_bread_crumbs_on_several_levels.json b/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_bread_crumbs_on_several_levels.json
index fe5e86638338bf7088090d76e91c23e6436e3204..5cbe3a1586d00589320481819c7976f4d04bb2c5 100644 (file)
--- a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_bread_crumbs_on_several_levels.json
+++ b/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_bread_crumbs_on_several_levels.json
@@ -1,4 +1,5 @@
 {
+  "organization": "my-org",
   "key": "palap:src/main/xoo/Source.xoo",
   "id": "cdef",
   "name": "Source.xoo",

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_component_info_when_anonymous_no_snapshot.json b/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_component_info_when_anonymous_no_snapshot.json
index ede37f60c36dc899de18dad78b62ae444e60eec5..6fe16e2a3081b348e6165d294c0000cdddbdeffd 100644 (file)
--- a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_component_info_when_anonymous_no_snapshot.json
+++ b/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_component_info_when_anonymous_no_snapshot.json
@@ -1,4 +1,5 @@
 {
+  "organization": "my-org",
   "key": "polop",
   "id": "abcd",
   "name": "Polop",

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_component_info_when_snapshot.json b/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_component_info_when_snapshot.json
index 90752cb430af05948631e924d39ba50f6b20565f..1303f9901d9c26d04bdc58d21c46c0e3c9a097d1 100644 (file)
--- a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_component_info_when_snapshot.json
+++ b/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_component_info_when_snapshot.json
@@ -1,4 +1,5 @@
 {
+  "organization": "my-org",
   "key": "polop",
   "id": "abcd",
   "name": "Polop",

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_component_info_with_favourite.json b/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_component_info_with_favourite.json
index 1eea2061adeb16e02da101f5968a0eb87cb4c5fc..45aea77e5fa05f9cf2403db1ec5334d2fb01846e 100644 (file)
--- a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_component_info_with_favourite.json
+++ b/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_component_info_with_favourite.json
@@ -1,4 +1,5 @@
 {
+  "organization": "my-org",
   "key": "polop",
   "id": "abcd",
   "name": "Polop",