SONAR-13999 drop organization from Components WS

3 files changed, 55 insertions, 1 deletions

diff --git a/server/sonar-db-dao/src/testFixtures/java/org/sonar/db/component/ComponentDbTester.java b/server/sonar-db-dao/src/testFixtures/java/org/sonar/db/component/ComponentDbTester.java
index 03954390f64..5e8134243d7 100644
--- a/server/sonar-db-dao/src/testFixtures/java/org/sonar/db/component/ComponentDbTester.java
+++ b/server/sonar-db-dao/src/testFixtures/java/org/sonar/db/component/ComponentDbTester.java
@@ -52,6 +52,10 @@ public class ComponentDbTester {
   }
 
   public SnapshotDto insertViewAndSnapshot(ComponentDto component) {
+    if (component.getOrganizationUuid() == null) {
+      component.setOrganizationUuid(db.getDefaultOrganization().getUuid());
+    }
+
     dbClient.componentDao().insert(dbSession, component);
     return insertSnapshot(component);
   }
@@ -101,6 +105,11 @@ public class ComponentDbTester {
       dtoPopulator);
   }
 
+  public final ComponentDto insertPublicProject(Consumer<ComponentDto> componentDtoPopulator, Consumer<ProjectDto> projectDtoPopulator) {
+    return insertComponentAndBranchAndProject(ComponentTesting.newPublicProjectDto(db.getDefaultOrganization()), false, defaults(), componentDtoPopulator,
+      projectDtoPopulator);
+  }
+
   public final ComponentDto insertPrivateProject(OrganizationDto organizationDto, Consumer<ComponentDto> componentDtoPopulator) {
     return insertPrivateProject(organizationDto, componentDtoPopulator, defaults());
   }
@@ -168,6 +177,10 @@ public class ComponentDbTester {
     return getProjectDto(componentDto);
   }
 
+  public final ComponentDto insertPrivateProject(String uuid, Consumer<ComponentDto> dtoPopulator) {
+    return insertPrivateProject(db.getDefaultOrganization(), uuid, dtoPopulator);
+  }
+
   public ProjectDto insertPrivateProjectDto(OrganizationDto organization, Consumer<BranchDto> branchConsumer) {
     ComponentDto componentDto = insertPrivateProjectWithCustomBranch(organization, branchConsumer, defaults());
     return getProjectDto(componentDto);
@@ -267,18 +280,28 @@ public class ComponentDbTester {
     return insertPrivatePortfolio(organization, defaults());
   }
 
+  public final ComponentDto insertPrivatePortfolio(Consumer<ComponentDto> dtoPopulator) {
+    return insertComponentImpl(ComponentTesting.newView(db.getDefaultOrganization()).setPrivate(true), true, dtoPopulator);
+  }
+
   public final ComponentDto insertPrivatePortfolio(OrganizationDto organization, Consumer<ComponentDto> dtoPopulator) {
     return insertComponentImpl(ComponentTesting.newView(organization).setPrivate(true), true, dtoPopulator);
   }
 
   public final ComponentDto insertPublicApplication() {
-    return insertPublicApplication(db.getDefaultOrganization());
+    return insertPublicApplication(db.getDefaultOrganization(), defaults());
   }
 
+  public final ComponentDto insertPublicApplication(Consumer<ComponentDto> dtoPopulator) {
+    return insertPublicApplication(db.getDefaultOrganization(), dtoPopulator);
+  }
+
+  @Deprecated
   public final ComponentDto insertPublicApplication(OrganizationDto organization) {
     return insertPublicApplication(organization, defaults());
   }
 
+  @Deprecated
   public final ComponentDto insertPublicApplication(OrganizationDto organization, Consumer<ComponentDto> dtoPopulator) {
     return insertComponentAndBranchAndProject(ComponentTesting.newApplication(organization).setPrivate(false), false, defaults(), dtoPopulator);
   }
diff --git a/server/sonar-db-dao/src/testFixtures/java/org/sonar/db/component/ComponentTesting.java b/server/sonar-db-dao/src/testFixtures/java/org/sonar/db/component/ComponentTesting.java
index 070891812f0..ebf02698f04 100644
--- a/server/sonar-db-dao/src/testFixtures/java/org/sonar/db/component/ComponentTesting.java
+++ b/server/sonar-db-dao/src/testFixtures/java/org/sonar/db/component/ComponentTesting.java
@@ -147,6 +147,11 @@ public class ComponentTesting {
     return newProjectDto(organizationDto.getUuid(), uuid, true);
   }
 
+
+  public static ComponentDto newPublicProjectDto() {
+    return newProjectDto(Uuids.createFast(), false);
+  }
+
   // TODO remove
   @Deprecated
   public static ComponentDto newPublicProjectDto(OrganizationDto organizationDto) {
@@ -211,10 +216,24 @@ public class ComponentTesting {
       .setPrivate(isPrivate);
   }
 
+  public static ComponentDto newView() {
+    return newView(Uuids.createFast());
+  }
+
+  public static ComponentDto newView(String uuid) {
+    return newPrivateProjectDto(uuid)
+        .setUuid(uuid)
+        .setScope(Scopes.PROJECT)
+        .setQualifier(Qualifiers.VIEW)
+        .setPrivate(false);
+  }
+
+  @Deprecated
   public static ComponentDto newView(OrganizationDto organizationDto) {
     return newView(organizationDto.getUuid(), Uuids.createFast());
   }
 
+  @Deprecated
   public static ComponentDto newView(OrganizationDto organizationDto, String uuid) {
     return newPrivateProjectDto(organizationDto, uuid)
       .setUuid(uuid)
diff --git a/server/sonar-db-dao/src/testFixtures/java/org/sonar/db/qualitygate/QualityGateDbTester.java b/server/sonar-db-dao/src/testFixtures/java/org/sonar/db/qualitygate/QualityGateDbTester.java
index 7008054b1e1..5d6f40a5799 100644
--- a/server/sonar-db-dao/src/testFixtures/java/org/sonar/db/qualitygate/QualityGateDbTester.java
+++ b/server/sonar-db-dao/src/testFixtures/java/org/sonar/db/qualitygate/QualityGateDbTester.java
@@ -57,6 +57,12 @@ public class QualityGateDbTester {
   }
 
   @SafeVarargs
+  public final QGateWithOrgDto insertQualityGate(Consumer<QualityGateDto>... dtoPopulators) {
+    return insertQualityGate(db.getDefaultOrganization(), dtoPopulators);
+  }
+
+  @Deprecated
+  @SafeVarargs
   public final QGateWithOrgDto insertQualityGate(OrganizationDto organization, Consumer<QualityGateDto>... dtoPopulators) {
     QualityGateDto qualityGate = new QualityGateDto()
       .setName(randomAlphanumeric(30))
@@ -80,6 +86,12 @@ public class QualityGateDbTester {
   }
 
   @SafeVarargs
+  public final QualityGateDto createDefaultQualityGate(Consumer<QualityGateDto>... dtoPopulators) {
+    return createDefaultQualityGate(db.getDefaultOrganization(), dtoPopulators);
+  }
+
+  @SafeVarargs
+  @Deprecated
   public final QualityGateDto createDefaultQualityGate(OrganizationDto organization, Consumer<QualityGateDto>... dtoPopulators) {
     QualityGateDto defaultQGate = insertQualityGate(organization, dtoPopulators);
     setDefaultQualityGate(organization, defaultQGate);