SONAR-19558 Update rest of tests for other modules

17 files changed, 101 insertions, 93 deletions

diff --git a/server/sonar-webserver-core/src/it/java/org/sonar/server/platform/PersistentSettingsIT.java b/server/sonar-webserver-core/src/it/java/org/sonar/server/platform/PersistentSettingsIT.java
index efa71811800..2fb88e57f69 100644
--- a/server/sonar-webserver-core/src/it/java/org/sonar/server/platform/PersistentSettingsIT.java
+++ b/server/sonar-webserver-core/src/it/java/org/sonar/server/platform/PersistentSettingsIT.java
@@ -33,7 +33,7 @@ import static org.mockito.Mockito.verify;
 
 public class PersistentSettingsIT {
   @Rule
-  public DbTester dbTester = DbTester.create(System2.INSTANCE);
+  public DbTester dbTester = DbTester.create(System2.INSTANCE, true);
   private Settings delegate = new MapSettings();
   private SettingsChangeNotifier changeNotifier = mock(SettingsChangeNotifier.class);
   private PersistentSettings underTest = new PersistentSettings(delegate, dbTester.getDbClient(), changeNotifier);
diff --git a/server/sonar-webserver-core/src/it/java/org/sonar/server/platform/StartupMetadataPersisterIT.java b/server/sonar-webserver-core/src/it/java/org/sonar/server/platform/StartupMetadataPersisterIT.java
index 89d7050a583..3b31f020c8f 100644
--- a/server/sonar-webserver-core/src/it/java/org/sonar/server/platform/StartupMetadataPersisterIT.java
+++ b/server/sonar-webserver-core/src/it/java/org/sonar/server/platform/StartupMetadataPersisterIT.java
@@ -32,7 +32,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 public class StartupMetadataPersisterIT {
 
   @Rule
-  public DbTester dbTester = DbTester.create(System2.INSTANCE);
+  public DbTester dbTester = DbTester.create(System2.INSTANCE, true);
 
   private StartupMetadata metadata = new StartupMetadata(123_456_789L);
   private StartupMetadataPersister underTest = new StartupMetadataPersister(metadata, dbTester.getDbClient());
diff --git a/server/sonar-webserver-core/src/it/java/org/sonar/server/platform/serverid/ServerIdManagerIT.java b/server/sonar-webserver-core/src/it/java/org/sonar/server/platform/serverid/ServerIdManagerIT.java
index 85754d2e20e..178d99ea61f 100644
--- a/server/sonar-webserver-core/src/it/java/org/sonar/server/platform/serverid/ServerIdManagerIT.java
+++ b/server/sonar-webserver-core/src/it/java/org/sonar/server/platform/serverid/ServerIdManagerIT.java
@@ -60,7 +60,7 @@ public class ServerIdManagerIT {
   private static final String CHECKSUM_1 = randomAlphanumeric(12);
 
   @Rule
-  public final DbTester dbTester = DbTester.create(System2.INSTANCE);
+  public final DbTester dbTester = DbTester.create(System2.INSTANCE, true);
 
   private final ServerIdChecksum serverIdChecksum = mock(ServerIdChecksum.class);
   private final ServerIdFactory serverIdFactory = mock(ServerIdFactory.class);
diff --git a/server/sonar-webserver-core/src/it/java/org/sonar/server/startup/RegisterMetricsIT.java b/server/sonar-webserver-core/src/it/java/org/sonar/server/startup/RegisterMetricsIT.java
index 1f1b1db9017..15ceb3456d4 100644
--- a/server/sonar-webserver-core/src/it/java/org/sonar/server/startup/RegisterMetricsIT.java
+++ b/server/sonar-webserver-core/src/it/java/org/sonar/server/startup/RegisterMetricsIT.java
@@ -44,7 +44,7 @@ import static org.sonar.core.util.stream.MoreCollectors.uniqueIndex;
 public class RegisterMetricsIT {
 
   @Rule
-  public DbTester dbTester = DbTester.create(System2.INSTANCE);
+  public DbTester dbTester = DbTester.create(System2.INSTANCE, true);
 
   private final UuidFactory uuidFactory = new SequenceUuidFactory();
   private final DbClient dbClient = dbTester.getDbClient();
diff --git a/server/sonar-webserver-core/src/it/java/org/sonar/server/startup/RegisterPluginsIT.java b/server/sonar-webserver-core/src/it/java/org/sonar/server/startup/RegisterPluginsIT.java
index 52f24f023df..a52df0e30f4 100644
--- a/server/sonar-webserver-core/src/it/java/org/sonar/server/startup/RegisterPluginsIT.java
+++ b/server/sonar-webserver-core/src/it/java/org/sonar/server/startup/RegisterPluginsIT.java
@@ -51,7 +51,7 @@ public class RegisterPluginsIT {
   @Rule
   public TemporaryFolder temp = new TemporaryFolder();
   @Rule
-  public DbTester dbTester = DbTester.create(System2.INSTANCE);
+  public DbTester dbTester = DbTester.create(System2.INSTANCE, true);
 
   private final long now = 12345L;
   private final DbClient dbClient = dbTester.getDbClient();
diff --git a/server/sonar-webserver-core/src/it/java/org/sonar/server/startup/UpgradeSuggestionsCleanerIT.java b/server/sonar-webserver-core/src/it/java/org/sonar/server/startup/UpgradeSuggestionsCleanerIT.java
index b621a7e8238..6ad7798b84f 100644
--- a/server/sonar-webserver-core/src/it/java/org/sonar/server/startup/UpgradeSuggestionsCleanerIT.java
+++ b/server/sonar-webserver-core/src/it/java/org/sonar/server/startup/UpgradeSuggestionsCleanerIT.java
@@ -47,7 +47,7 @@ public class UpgradeSuggestionsCleanerIT {
   private static final String TASK_UUID = "b8d564dd-4ceb-4dba-8a3d-5fafa2d72cdf";
 
   @Rule
-  public DbTester dbTester = DbTester.create(System2.INSTANCE);
+  public DbTester dbTester = DbTester.create(System2.INSTANCE, true);
 
   private final SonarRuntime sonarRuntime = mock(SonarRuntime.class);
   private final UpgradeSuggestionsCleaner underTest = new UpgradeSuggestionsCleaner(dbTester.getDbClient(), sonarRuntime);
diff --git a/server/sonar-webserver-core/src/it/java/org/sonar/server/webhook/WebhookQGChangeEventListenerIT.java b/server/sonar-webserver-core/src/it/java/org/sonar/server/webhook/WebhookQGChangeEventListenerIT.java
index c5b95aa2292..da1561f6320 100644
--- a/server/sonar-webserver-core/src/it/java/org/sonar/server/webhook/WebhookQGChangeEventListenerIT.java
+++ b/server/sonar-webserver-core/src/it/java/org/sonar/server/webhook/WebhookQGChangeEventListenerIT.java
@@ -44,6 +44,7 @@ import org.sonar.db.DbTester;
 import org.sonar.db.component.AnalysisPropertyDto;
 import org.sonar.db.component.BranchDto;
 import org.sonar.db.component.BranchType;
+import org.sonar.db.component.ProjectData;
 import org.sonar.db.component.SnapshotDto;
 import org.sonar.db.project.ProjectDto;
 import org.sonar.server.qualitygate.EvaluatedQualityGate;
@@ -71,7 +72,7 @@ public class WebhookQGChangeEventListenerIT {
   private static final Set<QGChangeEventListener.ChangedIssue> CHANGED_ISSUES_ARE_IGNORED = emptySet();
 
   @Rule
-  public DbTester dbTester = DbTester.create(System2.INSTANCE);
+  public DbTester dbTester = DbTester.create(System2.INSTANCE, true);
 
   private DbClient dbClient = dbTester.getDbClient();
 
@@ -267,10 +268,8 @@ public class WebhookQGChangeEventListenerIT {
   }
 
   public ProjectAndBranch insertMainBranch() {
-    ProjectDto project = dbTester.components().insertPrivateProject().getProjectDto();
-    BranchDto branch = dbTester.getDbClient().branchDao().selectByUuid(dbTester.getSession(), project.getUuid()).get();
-    dbTester.commit();
-    return new ProjectAndBranch(project, branch);
+    ProjectData project = dbTester.components().insertPrivateProject();
+    return new ProjectAndBranch(project.getProjectDto(), project.getMainBranchDto());
   }
 
   public ProjectAndBranch insertBranch(BranchType type, String branchKey) {
diff --git a/server/sonar-webserver-core/src/test/java/org/sonar/server/issue/index/AsyncIssueIndexingImplTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/issue/index/AsyncIssueIndexingImplTest.java
index fca9cbc6ae2..0618cc255bf 100644
--- a/server/sonar-webserver-core/src/test/java/org/sonar/server/issue/index/AsyncIssueIndexingImplTest.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/issue/index/AsyncIssueIndexingImplTest.java
@@ -65,7 +65,7 @@ import static org.sonar.db.component.SnapshotDto.STATUS_PROCESSED;
 public class AsyncIssueIndexingImplTest {
 
   @Rule
-  public DbTester dbTester = DbTester.create(System2.INSTANCE);
+  public DbTester dbTester = DbTester.create(System2.INSTANCE, true);
   @Rule
   public LogTester logTester = new LogTester();
 
diff --git a/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/db/CheckAnyonePermissionsAtStartupTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/db/CheckAnyonePermissionsAtStartupTest.java
index 381a9f7aa91..db0b42ec19f 100644
--- a/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/db/CheckAnyonePermissionsAtStartupTest.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/db/CheckAnyonePermissionsAtStartupTest.java
@@ -32,6 +32,7 @@ import org.sonar.api.utils.log.LoggerLevel;
 import org.sonar.db.DbClient;
 import org.sonar.db.DbTester;
 import org.sonar.db.component.ComponentDto;
+import org.sonar.db.project.ProjectDto;
 import org.sonar.db.user.GroupDto;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -41,7 +42,7 @@ public class CheckAnyonePermissionsAtStartupTest {
   @ClassRule
   public static LogTester logTester = new LogTester().setLevel(LoggerLevel.WARN);
   @Rule
-  public final DbTester dbTester = DbTester.create(System2.INSTANCE);
+  public final DbTester dbTester = DbTester.create(System2.INSTANCE, true);
   private final DbClient dbClient = dbTester.getDbClient();
   private final MapSettings settings = new MapSettings();
   private final CheckAnyonePermissionsAtStartup underTest = new CheckAnyonePermissionsAtStartup(dbClient, settings.asConfig());
@@ -157,9 +158,9 @@ public class CheckAnyonePermissionsAtStartupTest {
 
   private void createPublicProjects(int projectCount, boolean includeAnyonePerm) {
     IntStream.rangeClosed(1, projectCount).forEach(i -> {
-      ComponentDto project = dbTester.components().insertPublicProject(p -> p.setKey("key-" + i)).getMainBranchComponent();
+      ProjectDto project = dbTester.components().insertPublicProject(p -> p.setKey("key-" + i)).getProjectDto();
       if (includeAnyonePerm) {
-        dbTester.users().insertProjectPermissionOnAnyone("perm-" + i, project);
+        dbTester.users().insertEntityPermissionOnAnyone("perm-" + i, project);
       }
     });
     underTest.start();
diff --git a/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/db/CheckLanguageSpecificParamsAtStartupTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/db/CheckLanguageSpecificParamsAtStartupTest.java
index 5c2c8fa06fd..99521ea0844 100644
--- a/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/db/CheckLanguageSpecificParamsAtStartupTest.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/db/CheckLanguageSpecificParamsAtStartupTest.java
@@ -42,7 +42,7 @@ public class CheckLanguageSpecificParamsAtStartupTest {
   @ClassRule
   public static LogTester logTester = new LogTester().setLevel(LoggerLevel.WARN);
   @Rule
-  public final DbTester dbTester = DbTester.create(System2.INSTANCE);
+  public final DbTester dbTester = DbTester.create(System2.INSTANCE, true);
   private final MapSettings settings = new MapSettings();
   private final CheckLanguageSpecificParamsAtStartup underTest = new CheckLanguageSpecificParamsAtStartup(settings.asConfig());
 
diff --git a/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/monitoring/AlmConfigurationSectionTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/monitoring/AlmConfigurationSectionTest.java
index 21a7b6ca663..508d982c16b 100644
--- a/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/monitoring/AlmConfigurationSectionTest.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/monitoring/AlmConfigurationSectionTest.java
@@ -32,7 +32,7 @@ import static org.assertj.core.api.Assertions.tuple;
 public class AlmConfigurationSectionTest {
 
   @Rule
-  public DbTester db = DbTester.create();
+  public DbTester db = DbTester.create(true);
 
   private AlmConfigurationSection underTest = new AlmConfigurationSection(db.getDbClient());
 
diff --git a/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/monitoring/DbConnectionSectionIT.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/monitoring/DbConnectionSectionIT.java
index f5f0e5241d8..3a6407b2d8e 100644
--- a/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/monitoring/DbConnectionSectionIT.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/monitoring/DbConnectionSectionIT.java
@@ -36,7 +36,7 @@ import static org.sonar.process.systeminfo.SystemInfoUtils.attribute;
 public class DbConnectionSectionIT {
 
   @Rule
-  public DbTester dbTester = DbTester.create(System2.INSTANCE);
+  public DbTester dbTester = DbTester.create(System2.INSTANCE, true);
 
   private final DatabaseVersion databaseVersion = mock(DatabaseVersion.class);
   private final SonarRuntime runtime = mock(SonarRuntime.class);
diff --git a/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/monitoring/SettingsSectionTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/monitoring/SettingsSectionTest.java
index a402a307134..9b6aca552c7 100644
--- a/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/monitoring/SettingsSectionTest.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/monitoring/SettingsSectionTest.java
@@ -49,7 +49,7 @@ public class SettingsSectionTest {
   private static final String PASSWORD_PROPERTY = "sonar.password";
 
   @Rule
-  public DbTester dbTester = DbTester.create(System2.INSTANCE);
+  public DbTester dbTester = DbTester.create(System2.INSTANCE, true);
 
   private PropertyDefinitions defs = new PropertyDefinitions(System2.INSTANCE, PropertyDefinition.builder(PASSWORD_PROPERTY).type(PropertyType.PASSWORD).build());
   private Settings settings = new MapSettings(defs);
diff --git a/server/sonar-webserver-core/src/test/java/org/sonar/server/qualitygate/ProjectsInWarningDaemonTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/qualitygate/ProjectsInWarningDaemonTest.java
index 3d4d17d1ecc..ca64dfb02b4 100644
--- a/server/sonar-webserver-core/src/test/java/org/sonar/server/qualitygate/ProjectsInWarningDaemonTest.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/qualitygate/ProjectsInWarningDaemonTest.java
@@ -32,7 +32,9 @@ import org.sonar.api.utils.System2;
 import org.sonar.api.utils.log.LoggerLevel;
 import org.sonar.db.DbTester;
 import org.sonar.db.component.ComponentDto;
+import org.sonar.db.component.ProjectData;
 import org.sonar.db.metric.MetricDto;
+import org.sonar.db.project.ProjectDto;
 import org.sonar.server.es.EsTester;
 import org.sonar.server.measure.index.ProjectMeasuresIndex;
 import org.sonar.server.measure.index.ProjectMeasuresIndexer;
@@ -53,7 +55,7 @@ import static org.sonar.server.qualitygate.ProjectsInWarningDaemon.PROJECTS_IN_W
 public class ProjectsInWarningDaemonTest {
 
   @Rule
-  public DbTester db = DbTester.create();
+  public DbTester db = DbTester.create(true);
   @Rule
   public EsTester es = EsTester.create();
   @Rule
@@ -115,15 +117,15 @@ public class ProjectsInWarningDaemonTest {
   public void stop_thread_when_number_of_projects_in_warning_reach_zero() throws InterruptedException {
     allowLockToBeAcquired();
     MetricDto qualityGateStatus = insertQualityGateStatusMetric();
-    ComponentDto project = insertProjectInWarning(qualityGateStatus);
+    ProjectData project = insertProjectInWarning(qualityGateStatus);
 
     underTest.notifyStart();
     assertProjectsInWarningValue(1L);
     // Set quality gate status of the project to OK => No more projects in warning
     db.getDbClient().liveMeasureDao().insertOrUpdate(db.getSession(),
-      newLiveMeasure(project, qualityGateStatus).setData(Metric.Level.OK.name()).setValue(null));
+      newLiveMeasure(project.getMainBranchComponent(), qualityGateStatus).setData(Metric.Level.OK.name()).setValue(null));
     db.commit();
-    projectMeasuresIndexer.indexOnAnalysis(project.uuid());
+    projectMeasuresIndexer.indexOnAnalysis(project.projectUuid());
 
     assertProjectsInWarningValue(0L);
     assertThat(logger.logs(Level.INFO))
@@ -208,11 +210,11 @@ public class ProjectsInWarningDaemonTest {
       .orElse(0L);
   }
 
-  private ComponentDto insertProjectInWarning(MetricDto qualityGateStatus) {
-    ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent();
+  private ProjectData insertProjectInWarning(MetricDto qualityGateStatus) {
+    ProjectData project = db.components().insertPrivateProject();
     db.measures().insertLiveMeasure(project, qualityGateStatus, lm -> lm.setData(WARN.name()).setValue(null));
-    authorizationIndexerTester.allowOnlyAnyone(project);
-    projectMeasuresIndexer.indexOnAnalysis(project.uuid());
+    authorizationIndexerTester.allowOnlyAnyone(project.getProjectDto());
+    projectMeasuresIndexer.indexOnAnalysis(project.projectUuid());
     return project;
   }
 
diff --git a/server/sonar-webserver-core/src/test/java/org/sonar/server/rule/RegisterRulesTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/rule/RegisterRulesTest.java
index 89a8a76de27..dd1ca1e7cfe 100644
--- a/server/sonar-webserver-core/src/test/java/org/sonar/server/rule/RegisterRulesTest.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/rule/RegisterRulesTest.java
@@ -130,7 +130,7 @@ public class RegisterRulesTest {
   private final TestSystem2 system = new TestSystem2().setNow(DATE1.getTime());
 
   @org.junit.Rule
-  public DbTester db = DbTester.create(system);
+  public DbTester db = DbTester.create(system, true);
   @org.junit.Rule
   public EsTester es = EsTester.create();
   @org.junit.Rule
diff --git a/server/sonar-webserver-core/src/test/java/org/sonar/server/startup/RegisterPermissionTemplatesTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/startup/RegisterPermissionTemplatesTest.java
index 113fcaeb441..3ed6b292343 100644
--- a/server/sonar-webserver-core/src/test/java/org/sonar/server/startup/RegisterPermissionTemplatesTest.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/startup/RegisterPermissionTemplatesTest.java
@@ -43,7 +43,7 @@ import static org.sonar.server.property.InternalProperties.DEFAULT_PROJECT_TEMPL
 public class RegisterPermissionTemplatesTest {
 
   @Rule
-  public DbTester db = DbTester.create(System2.INSTANCE);
+  public DbTester db = DbTester.create(System2.INSTANCE, true);
   @Rule
   public LogTester logTester = new LogTester();
 
diff --git a/server/sonar-webserver-core/src/test/java/org/sonar/server/telemetry/TelemetryDataLoaderImplTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/telemetry/TelemetryDataLoaderImplTest.java
index fe33ad00647..52755ce7ca7 100644
--- a/server/sonar-webserver-core/src/test/java/org/sonar/server/telemetry/TelemetryDataLoaderImplTest.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/telemetry/TelemetryDataLoaderImplTest.java
@@ -48,6 +48,7 @@ import org.sonar.db.DbTester;
 import org.sonar.db.alm.setting.AlmSettingDto;
 import org.sonar.db.component.AnalysisPropertyDto;
 import org.sonar.db.component.ComponentDto;
+import org.sonar.db.component.ProjectData;
 import org.sonar.db.component.SnapshotDto;
 import org.sonar.db.metric.MetricDto;
 import org.sonar.db.newcodeperiod.NewCodePeriodType;
@@ -102,7 +103,7 @@ public class TelemetryDataLoaderImplTest {
   private final TestSystem2 system2 = new TestSystem2().setNow(NOW);
 
   @Rule
-  public DbTester db = DbTester.create(system2);
+  public DbTester db = DbTester.create(system2, true);
 
   private final FakeServer server = new FakeServer();
   private final PluginRepository pluginRepository = mock(PluginRepository.class);
@@ -166,27 +167,29 @@ public class TelemetryDataLoaderImplTest {
     MetricDto coverage = db.measures().insertMetric(m -> m.setKey(COVERAGE_KEY));
     MetricDto nclocDistrib = db.measures().insertMetric(m -> m.setKey(NCLOC_LANGUAGE_DISTRIBUTION_KEY));
 
-    ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent();
-    db.measures().insertLiveMeasure(project1, lines, m -> m.setValue(110d));
-    db.measures().insertLiveMeasure(project1, ncloc, m -> m.setValue(110d));
-    db.measures().insertLiveMeasure(project1, coverage, m -> m.setValue(80d));
-    db.measures().insertLiveMeasure(project1, nclocDistrib, m -> m.setValue(null).setData("java=70;js=30;kotlin=10"));
-    db.measures().insertLiveMeasure(project1, bugsDto, m -> m.setValue(1d));
-    db.measures().insertLiveMeasure(project1, vulnerabilitiesDto, m -> m.setValue(1d).setData((String) null));
-    db.measures().insertLiveMeasure(project1, securityHotspotsDto, m -> m.setValue(1d).setData((String) null));
-    db.measures().insertLiveMeasure(project1, developmentCostDto, m -> m.setData("50").setValue(null));
-    db.measures().insertLiveMeasure(project1, technicalDebtDto, m -> m.setValue(5d).setData((String) null));
-
-    ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent();
-    db.measures().insertLiveMeasure(project2, lines, m -> m.setValue(200d));
-    db.measures().insertLiveMeasure(project2, ncloc, m -> m.setValue(200d));
-    db.measures().insertLiveMeasure(project2, coverage, m -> m.setValue(80d));
-    db.measures().insertLiveMeasure(project2, nclocDistrib, m -> m.setValue(null).setData("java=180;js=20"));
-
-    SnapshotDto project1Analysis = db.components().insertSnapshot(project1, t -> t.setLast(true).setBuildDate(analysisDate));
-    SnapshotDto project2Analysis = db.components().insertSnapshot(project2, t -> t.setLast(true).setBuildDate(analysisDate));
-    db.measures().insertMeasure(project1, project1Analysis, nclocDistrib, m -> m.setData("java=70;js=30;kotlin=10"));
-    db.measures().insertMeasure(project2, project2Analysis, nclocDistrib, m -> m.setData("java=180;js=20"));
+    ProjectData projectData1 = db.components().insertPrivateProject();
+    ComponentDto mainBranch1 = projectData1.getMainBranchComponent();
+    db.measures().insertLiveMeasure(mainBranch1, lines, m -> m.setValue(110d));
+    db.measures().insertLiveMeasure(mainBranch1, ncloc, m -> m.setValue(110d));
+    db.measures().insertLiveMeasure(mainBranch1, coverage, m -> m.setValue(80d));
+    db.measures().insertLiveMeasure(mainBranch1, nclocDistrib, m -> m.setValue(null).setData("java=70;js=30;kotlin=10"));
+    db.measures().insertLiveMeasure(mainBranch1, bugsDto, m -> m.setValue(1d));
+    db.measures().insertLiveMeasure(mainBranch1, vulnerabilitiesDto, m -> m.setValue(1d).setData((String) null));
+    db.measures().insertLiveMeasure(mainBranch1, securityHotspotsDto, m -> m.setValue(1d).setData((String) null));
+    db.measures().insertLiveMeasure(mainBranch1, developmentCostDto, m -> m.setData("50").setValue(null));
+    db.measures().insertLiveMeasure(mainBranch1, technicalDebtDto, m -> m.setValue(5d).setData((String) null));
+
+    ProjectData projectData2 = db.components().insertPrivateProject();
+    ComponentDto mainBranch2 = projectData2.getMainBranchComponent();
+    db.measures().insertLiveMeasure(mainBranch2, lines, m -> m.setValue(200d));
+    db.measures().insertLiveMeasure(mainBranch2, ncloc, m -> m.setValue(200d));
+    db.measures().insertLiveMeasure(mainBranch2, coverage, m -> m.setValue(80d));
+    db.measures().insertLiveMeasure(mainBranch2, nclocDistrib, m -> m.setValue(null).setData("java=180;js=20"));
+
+    SnapshotDto project1Analysis = db.components().insertSnapshot(mainBranch1, t -> t.setLast(true).setBuildDate(analysisDate));
+    SnapshotDto project2Analysis = db.components().insertSnapshot(mainBranch2, t -> t.setLast(true).setBuildDate(analysisDate));
+    db.measures().insertMeasure(mainBranch1, project1Analysis, nclocDistrib, m -> m.setData("java=70;js=30;kotlin=10"));
+    db.measures().insertMeasure(mainBranch2, project2Analysis, nclocDistrib, m -> m.setData("java=180;js=20"));
 
     insertAnalysisProperty(project1Analysis, "prop-uuid-1", SONAR_ANALYSIS_DETECTEDCI, "ci-1");
     insertAnalysisProperty(project2Analysis, "prop-uuid-2", SONAR_ANALYSIS_DETECTEDCI, "ci-2");
@@ -198,21 +201,21 @@ public class TelemetryDataLoaderImplTest {
     db.almSettings().insertGitHubAlmSetting();
     AlmSettingDto almSettingDto = db.almSettings().insertAzureAlmSetting(a -> a.setUrl("https://dev.azure.com"));
     AlmSettingDto gitHubAlmSetting = db.almSettings().insertGitHubAlmSetting(a -> a.setUrl("https://api.github.com"));
-    db.almSettings().insertAzureProjectAlmSetting(almSettingDto, db.components().getProjectDtoByMainBranch(project1));
-    db.almSettings().insertGitlabProjectAlmSetting(gitHubAlmSetting, db.components().getProjectDtoByMainBranch(project2));
+    db.almSettings().insertAzureProjectAlmSetting(almSettingDto, projectData1.getProjectDto());
+    db.almSettings().insertGitlabProjectAlmSetting(gitHubAlmSetting, projectData2.getProjectDto());
 
     // quality gates
     QualityGateDto qualityGate1 = db.qualityGates().insertQualityGate(qg -> qg.setName("QG1").setBuiltIn(true));
     QualityGateDto qualityGate2 = db.qualityGates().insertQualityGate(qg -> qg.setName("QG2"));
 
     // link one project to a non-default QG
-    db.qualityGates().associateProjectToQualityGate(db.components().getProjectDtoByMainBranch(project1), qualityGate1);
+    db.qualityGates().associateProjectToQualityGate(db.components().getProjectDtoByMainBranch(mainBranch1), qualityGate1);
 
-    var branch1 = db.components().insertProjectBranch(project1, branchDto -> branchDto.setKey("reference"));
-    var branch2 = db.components().insertProjectBranch(project1, branchDto -> branchDto.setKey("custom"));
+    var branch1 = db.components().insertProjectBranch(mainBranch1, branchDto -> branchDto.setKey("reference"));
+    var branch2 = db.components().insertProjectBranch(mainBranch1, branchDto -> branchDto.setKey("custom"));
 
-    var ncd1 = db.newCodePeriods().insert(project1.uuid(), NewCodePeriodType.NUMBER_OF_DAYS, "30");
-    var ncd2 = db.newCodePeriods().insert(project1.uuid(), branch2.branchUuid(), NewCodePeriodType.REFERENCE_BRANCH, "reference");
+    var ncd1 = db.newCodePeriods().insert(projectData1.projectUuid(), NewCodePeriodType.NUMBER_OF_DAYS, "30");
+    var ncd2 = db.newCodePeriods().insert(projectData1.projectUuid(), branch2.branchUuid(), NewCodePeriodType.REFERENCE_BRANCH, "reference");
 
     var instanceNcdId = NewCodeDefinition.getInstanceDefault().hashCode();
     var projectNcdId = new NewCodeDefinition(NewCodePeriodType.NUMBER_OF_DAYS.name(), "30", "project").hashCode();
@@ -240,11 +243,11 @@ public class TelemetryDataLoaderImplTest {
     assertThat(data.getProjects())
       .extracting(TelemetryData.Project::projectUuid, TelemetryData.Project::language, TelemetryData.Project::loc, TelemetryData.Project::lastAnalysis)
       .containsExactlyInAnyOrder(
-        tuple(project1.uuid(), "java", 70L, analysisDate),
-        tuple(project1.uuid(), "js", 30L, analysisDate),
-        tuple(project1.uuid(), "kotlin", 10L, analysisDate),
-        tuple(project2.uuid(), "java", 180L, analysisDate),
-        tuple(project2.uuid(), "js", 20L, analysisDate));
+        tuple(projectData1.projectUuid(), "java", 70L, analysisDate),
+        tuple(projectData1.projectUuid(), "js", 30L, analysisDate),
+        tuple(projectData1.projectUuid(), "kotlin", 10L, analysisDate),
+        tuple(projectData2.projectUuid(), "java", 180L, analysisDate),
+        tuple(projectData2.projectUuid(), "js", 20L, analysisDate));
     assertThat(data.getProjectStatistics())
       .extracting(ProjectStatistics::getBranchCount, ProjectStatistics::getPullRequestCount, ProjectStatistics::getQualityGate,
         ProjectStatistics::getScm, ProjectStatistics::getCi, ProjectStatistics::getDevopsPlatform,
@@ -261,8 +264,8 @@ public class TelemetryDataLoaderImplTest {
       .containsExactlyInAnyOrder(
         tuple(branch1.uuid(), projectNcdId),
         tuple(branch2.uuid(), branchNcdId),
-        tuple(project1.uuid(), projectNcdId),
-        tuple(project2.uuid(), instanceNcdId));
+        tuple(mainBranch1.uuid(), projectNcdId),
+        tuple(mainBranch2.uuid(), instanceNcdId));
 
     assertThat(data.getNewCodeDefinitions())
       .extracting(NewCodeDefinition::scope, NewCodeDefinition::type, NewCodeDefinition::value)
@@ -286,22 +289,24 @@ public class TelemetryDataLoaderImplTest {
 
     MetricDto qg = db.measures().insertMetric(m -> m.setKey(ALERT_STATUS_KEY));
 
-    ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent();
+    ProjectData projectData1 = db.components().insertPrivateProject();
+    ComponentDto mainBranch1 = projectData1.getMainBranchComponent();
 
-    ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent();
+    ProjectData projectData2 = db.components().insertPrivateProject();
+    ComponentDto mainBranch2 = projectData2.getMainBranchComponent();
 
-    SnapshotDto project1Analysis1 = db.components().insertSnapshot(project1, t -> t.setLast(true).setBuildDate(analysisDate));
-    SnapshotDto project1Analysis2 = db.components().insertSnapshot(project1, t -> t.setLast(true).setBuildDate(analysisDate));
-    SnapshotDto project2Analysis = db.components().insertSnapshot(project2, t -> t.setLast(true).setBuildDate(analysisDate));
-    db.measures().insertMeasure(project1, project1Analysis1, qg, pm -> pm.setData("OK"));
-    db.measures().insertMeasure(project1, project1Analysis2, qg, pm -> pm.setData("ERROR"));
-    db.measures().insertMeasure(project2, project2Analysis, qg, pm -> pm.setData("ERROR"));
+    SnapshotDto project1Analysis1 = db.components().insertSnapshot(mainBranch1, t -> t.setLast(true).setBuildDate(analysisDate));
+    SnapshotDto project1Analysis2 = db.components().insertSnapshot(mainBranch1, t -> t.setLast(true).setBuildDate(analysisDate));
+    SnapshotDto project2Analysis = db.components().insertSnapshot(mainBranch2, t -> t.setLast(true).setBuildDate(analysisDate));
+    db.measures().insertMeasure(mainBranch1, project1Analysis1, qg, pm -> pm.setData("OK"));
+    db.measures().insertMeasure(mainBranch1, project1Analysis2, qg, pm -> pm.setData("ERROR"));
+    db.measures().insertMeasure(mainBranch2, project2Analysis, qg, pm -> pm.setData("ERROR"));
 
-    var branch1 = db.components().insertProjectBranch(project1, branchDto -> branchDto.setKey("reference"));
-    var branch2 = db.components().insertProjectBranch(project1, branchDto -> branchDto.setKey("custom"));
+    var branch1 = db.components().insertProjectBranch(mainBranch1, branchDto -> branchDto.setKey("reference"));
+    var branch2 = db.components().insertProjectBranch(mainBranch1, branchDto -> branchDto.setKey("custom"));
 
-    db.newCodePeriods().insert(project1.uuid(), NewCodePeriodType.NUMBER_OF_DAYS, "30");
-    db.newCodePeriods().insert(project1.uuid(), branch2.branchUuid(), NewCodePeriodType.REFERENCE_BRANCH, "reference");
+    db.newCodePeriods().insert(projectData1.projectUuid(), NewCodePeriodType.NUMBER_OF_DAYS, "30");
+    db.newCodePeriods().insert(projectData1.projectUuid(), branch2.branchUuid(), NewCodePeriodType.REFERENCE_BRANCH, "reference");
 
     var instanceNcdId = NewCodeDefinition.getInstanceDefault().hashCode();
     var projectNcdId = new NewCodeDefinition(NewCodePeriodType.NUMBER_OF_DAYS.name(), "30", "project").hashCode();
@@ -314,8 +319,8 @@ public class TelemetryDataLoaderImplTest {
       .containsExactlyInAnyOrder(
         tuple(branch1.uuid(), projectNcdId, 0, 0),
         tuple(branch2.uuid(), branchNcdId, 0, 0),
-        tuple(project1.uuid(), projectNcdId, 1, 2),
-        tuple(project2.uuid(), instanceNcdId, 0, 1));
+        tuple(mainBranch1.uuid(), projectNcdId, 1, 2),
+        tuple(mainBranch2.uuid(), instanceNcdId, 0, 1));
 
   }
 
@@ -349,30 +354,31 @@ public class TelemetryDataLoaderImplTest {
     MetricDto coverage = db.measures().insertMetric(m -> m.setKey(COVERAGE_KEY));
     MetricDto nclocDistrib = db.measures().insertMetric(m -> m.setKey(NCLOC_LANGUAGE_DISTRIBUTION_KEY));
 
-    ComponentDto project = db.components().insertPublicProject().getMainBranchComponent();
-    db.measures().insertLiveMeasure(project, lines, m -> m.setValue(110d));
-    db.measures().insertLiveMeasure(project, ncloc, m -> m.setValue(110d));
-    db.measures().insertLiveMeasure(project, coverage, m -> m.setValue(80d));
-    db.measures().insertLiveMeasure(project, nclocDistrib, m -> m.setValue(null).setData("java=70;js=30;kotlin=10"));
+    ProjectData projectData = db.components().insertPublicProject();
+    ComponentDto mainBranch = projectData.getMainBranchComponent();
+    db.measures().insertLiveMeasure(mainBranch, lines, m -> m.setValue(110d));
+    db.measures().insertLiveMeasure(mainBranch, ncloc, m -> m.setValue(110d));
+    db.measures().insertLiveMeasure(mainBranch, coverage, m -> m.setValue(80d));
+    db.measures().insertLiveMeasure(mainBranch, nclocDistrib, m -> m.setValue(null).setData("java=70;js=30;kotlin=10"));
 
-    ComponentDto branch = db.components().insertProjectBranch(project, b -> b.setBranchType(BRANCH));
+    ComponentDto branch = db.components().insertProjectBranch(mainBranch, b -> b.setBranchType(BRANCH));
     db.measures().insertLiveMeasure(branch, lines, m -> m.setValue(180d));
     db.measures().insertLiveMeasure(branch, ncloc, m -> m.setValue(180d));
     db.measures().insertLiveMeasure(branch, coverage, m -> m.setValue(80d));
     db.measures().insertLiveMeasure(branch, nclocDistrib, m -> m.setValue(null).setData("java=100;js=50;kotlin=30"));
 
-    SnapshotDto project1Analysis = db.components().insertSnapshot(project, t -> t.setLast(true));
+    SnapshotDto project1Analysis = db.components().insertSnapshot(mainBranch, t -> t.setLast(true));
     SnapshotDto project2Analysis = db.components().insertSnapshot(branch, t -> t.setLast(true));
-    db.measures().insertMeasure(project, project1Analysis, nclocDistrib, m -> m.setData("java=70;js=30;kotlin=10"));
+    db.measures().insertMeasure(mainBranch, project1Analysis, nclocDistrib, m -> m.setData("java=70;js=30;kotlin=10"));
     db.measures().insertMeasure(branch, project2Analysis, nclocDistrib, m -> m.setData("java=100;js=50;kotlin=30"));
 
     TelemetryData data = communityUnderTest.load();
 
     assertThat(data.getProjects()).extracting(TelemetryData.Project::projectUuid, TelemetryData.Project::language, TelemetryData.Project::loc)
       .containsExactlyInAnyOrder(
-        tuple(project.uuid(), "java", 100L),
-        tuple(project.uuid(), "js", 50L),
-        tuple(project.uuid(), "kotlin", 30L));
+        tuple(projectData.projectUuid(), "java", 100L),
+        tuple(projectData.projectUuid(), "js", 50L),
+        tuple(projectData.projectUuid(), "kotlin", 30L));
     assertThat(data.getProjectStatistics())
       .extracting(ProjectStatistics::getBranchCount, ProjectStatistics::getPullRequestCount,
         ProjectStatistics::getScm, ProjectStatistics::getCi)
@@ -385,11 +391,11 @@ public class TelemetryDataLoaderImplTest {
     server.setId("AU-TpxcB-iU5OvuD2FL7").setVersion("7.5.4");
     when(editionProvider.get()).thenReturn(Optional.of(COMMUNITY));
 
-    ComponentDto project = db.components().insertPublicProject().getMainBranchComponent();
+    ProjectData project = db.components().insertPublicProject();
 
-    ComponentDto branch = db.components().insertProjectBranch(project, b -> b.setBranchType(BRANCH));
+    ComponentDto branch = db.components().insertProjectBranch(project.getMainBranchComponent(), b -> b.setBranchType(BRANCH));
 
-    db.newCodePeriods().insert(project.uuid(), branch.branchUuid(), NewCodePeriodType.NUMBER_OF_DAYS, "30");
+    db.newCodePeriods().insert(project.projectUuid(), branch.branchUuid(), NewCodePeriodType.NUMBER_OF_DAYS, "30");
 
     var projectNcdId = new NewCodeDefinition(NewCodePeriodType.NUMBER_OF_DAYS.name(), "30", "project").hashCode();