SONAR-13999 remove orgs from favorite WS

2 files changed, 53 insertions, 7 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 e91b49a23ec..d617b3cddaa 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
@@ -185,9 +185,8 @@ public class ComponentDbTester {
     return insertComponentAndBranchAndProject(ComponentTesting.newPrivateProjectDto(organizationDto, uuid), true, defaults(), dtoPopulator);
   }
 
-
   public final ComponentDto insertPrivateProjectWithCustomBranch(String branchKey) {
-    return insertPrivateProjectWithCustomBranch(db.getDefaultOrganization(), b ->  b.setBranchType(BRANCH).setKey(branchKey), defaults());
+    return insertPrivateProjectWithCustomBranch(db.getDefaultOrganization(), b -> b.setBranchType(BRANCH).setKey(branchKey), defaults());
   }
 
   public final ComponentDto insertPrivateProjectWithCustomBranch(OrganizationDto organizationDto, Consumer<BranchDto> branchPopulator) {
@@ -342,21 +341,21 @@ public class ComponentDbTester {
   }
 
   public void addApplicationProject(ComponentDto application, ComponentDto... projects) {
-    for(ComponentDto project : projects){
+    for (ComponentDto project : projects) {
       dbClient.applicationProjectsDao().addProject(dbSession, application.uuid(), project.uuid());
     }
     db.commit();
   }
 
   public void addApplicationProject(ProjectDto application, ProjectDto... projects) {
-    for(ProjectDto project : projects){
+    for (ProjectDto project : projects) {
       dbClient.applicationProjectsDao().addProject(dbSession, application.getUuid(), project.getUuid());
     }
     db.commit();
   }
 
   public void addProjectBranchToApplicationBranch(BranchDto applicationBranch, BranchDto... projectBranches) {
-    for(BranchDto projectBranch : projectBranches){
+    for (BranchDto projectBranch : projectBranches) {
       dbClient.applicationProjectsDao().addProjectBranchToAppBranch(dbSession, applicationBranch, projectBranch);
     }
     db.commit();
@@ -378,6 +377,9 @@ public class ComponentDbTester {
   private ComponentDto insertComponentImpl(ComponentDto component, @Nullable Boolean isPrivate, Consumer<ComponentDto> dtoPopulator) {
     dtoPopulator.accept(component);
     checkState(isPrivate == null || component.isPrivate() == isPrivate, "Illegal modification of private flag");
+    if (component.getOrganizationUuid() == null) {
+      component.setOrganizationUuid(db.getDefaultOrganization().getUuid());
+    }
     dbClient.componentDao().insert(dbSession, component);
     db.commit();
 
@@ -389,6 +391,13 @@ public class ComponentDbTester {
   }
 
   public void insertComponents(ComponentDto... components) {
+    String defaultOrgUuid = db.getDefaultOrganization().getUuid();
+    Arrays.stream(components).forEach(c -> {
+      if (c.getOrganizationUuid() == null) {
+        c.setOrganizationUuid(defaultOrgUuid);
+      }
+    });
+
     dbClient.componentDao().insert(dbSession, asList(components));
     db.commit();
   }
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 eaf1028f7f1..070891812f0 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
@@ -121,26 +121,46 @@ public class ComponentTesting {
     return newModuleDto(Uuids.createFast(), subProjectOrProject);
   }
 
+  public static ComponentDto newPrivateProjectDto() {
+    return newProjectDto(Uuids.createFast(), true);
+  }
+
+  // TODO remove
+  @Deprecated
   public static ComponentDto newPrivateProjectDto(OrganizationDto organizationDto) {
     return newProjectDto(organizationDto.getUuid(), Uuids.createFast(), true);
   }
 
+  // TODO remove
+  @Deprecated
   public static ProjectDto createPrivateProjectDto(OrganizationDto organizationDto) {
     return createProjectDto(organizationDto.getUuid(), Uuids.createFast(), true);
   }
 
+  public static ComponentDto newPrivateProjectDto(String uuid) {
+    return newProjectDto(uuid, true);
+  }
+
+  // TODO remove
+  @Deprecated
   public static ComponentDto newPrivateProjectDto(OrganizationDto organizationDto, String uuid) {
     return newProjectDto(organizationDto.getUuid(), uuid, true);
   }
 
+  // TODO remove
+  @Deprecated
   public static ComponentDto newPublicProjectDto(OrganizationDto organizationDto) {
     return newProjectDto(organizationDto.getUuid(), Uuids.createFast(), false);
   }
 
+  // TODO remove
+  @Deprecated
   public static ComponentDto newPublicProjectDto(OrganizationDto organizationDto, String uuid) {
     return newProjectDto(organizationDto.getUuid(), uuid, false);
   }
 
+  // TODO remove
+  @Deprecated
   private static ProjectDto createProjectDto(String organizationUuid, String uuid, boolean isPrivate) {
     return new ProjectDto()
       .setOrganizationUuid(organizationUuid)
@@ -152,6 +172,25 @@ public class ComponentTesting {
       .setPrivate(isPrivate);
   }
 
+  private static ComponentDto newProjectDto(String uuid, boolean isPrivate) {
+    return new ComponentDto()
+      .setUuid(uuid)
+      .setUuidPath(UUID_PATH_OF_ROOT)
+      .setProjectUuid(uuid)
+      .setModuleUuidPath(UUID_PATH_SEPARATOR + uuid + UUID_PATH_SEPARATOR)
+      .setRootUuid(uuid)
+      .setDbKey("KEY_" + uuid)
+      .setName("NAME_" + uuid)
+      .setLongName("LONG_NAME_" + uuid)
+      .setDescription("DESCRIPTION_" + uuid)
+      .setScope(Scopes.PROJECT)
+      .setQualifier(Qualifiers.PROJECT)
+      .setPath(null)
+      .setLanguage(null)
+      .setEnabled(true)
+      .setPrivate(isPrivate);
+  }
+
   private static ComponentDto newProjectDto(String organizationUuid, String uuid, boolean isPrivate) {
     return new ComponentDto()
       .setOrganizationUuid(organizationUuid)
@@ -199,7 +238,6 @@ public class ComponentTesting {
     return newApplication(organizationDto.getUuid(), uuid);
   }
 
-
   public static ComponentDto newApplication(String organizationUuid) {
     return newApplication(organizationUuid, Uuids.createFast());
   }
@@ -293,7 +331,6 @@ public class ComponentTesting {
       .setPrivate(project.isPrivate());
   }
 
-
   public static ComponentDto newBranchComponent(ComponentDto project, BranchDto branchDto) {
     checkArgument(project.qualifier().equals(Qualifiers.PROJECT) || project.qualifier().equals(Qualifiers.APP));
     checkArgument(project.getMainBranchProjectUuid() == null);