From 7a6e871b1a37a53e76d483e0b65b811c6ac6beb9 Mon Sep 17 00:00:00 2001
From: Belen Pruvost <belen.pruvost@sonarsource.com>
Date: Tue, 17 Aug 2021 23:38:09 +0200
Subject: SONAR-15142 - Add componentKey to all logs

---
 .../sonar/db/almsettings/AlmSettingsDbTester.java    | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'server/sonar-db-dao/src/testFixtures/java/org/sonar/db/almsettings')

diff --git a/server/sonar-db-dao/src/testFixtures/java/org/sonar/db/almsettings/AlmSettingsDbTester.java b/server/sonar-db-dao/src/testFixtures/java/org/sonar/db/almsettings/AlmSettingsDbTester.java
index 10e245aaa8a..906d9099521 100644
--- a/server/sonar-db-dao/src/testFixtures/java/org/sonar/db/almsettings/AlmSettingsDbTester.java
+++ b/server/sonar-db-dao/src/testFixtures/java/org/sonar/db/almsettings/AlmSettingsDbTester.java
@@ -74,57 +74,57 @@ public class AlmSettingsDbTester {
   public final ProjectAlmSettingDto insertGitHubProjectAlmSetting(AlmSettingDto githubAlmSetting, ProjectDto project,
     Consumer<ProjectAlmSettingDto>... populators) {
     return insertProjectAlmSetting(newGithubProjectAlmSettingDto(githubAlmSetting, project), githubAlmSetting.getKey(),
-      project.getName(), populators);
+      project.getName(),  project.getKey(), populators);
   }
 
   public ProjectAlmSettingDto insertAzureProjectAlmSetting(AlmSettingDto azureAlmSetting, ProjectDto project) {
     return insertProjectAlmSetting(newAzureProjectAlmSettingDto(azureAlmSetting, project), azureAlmSetting.getKey(),
-      project.getName());
+      project.getName(), project.getKey());
   }
 
   public ProjectAlmSettingDto insertAzureMonoRepoProjectAlmSetting(AlmSettingDto azureAlmSetting, ProjectDto project) {
     return insertProjectAlmSetting(newAzureProjectAlmSettingDto(azureAlmSetting, project), azureAlmSetting.getKey(),
-      project.getName(), d -> d.setMonorepo(true));
+      project.getName(), project.getKey(), d -> d.setMonorepo(true));
   }
 
   public ProjectAlmSettingDto insertGitlabProjectAlmSetting(AlmSettingDto gitlabAlmSetting, ProjectDto project) {
     return insertProjectAlmSetting(newGitlabProjectAlmSettingDto(gitlabAlmSetting, project), gitlabAlmSetting.getKey(),
-      project.getName());
+      project.getName(), project.getKey());
   }
 
   @SafeVarargs
   public final ProjectAlmSettingDto insertAzureProjectAlmSetting(AlmSettingDto azureAlmSetting, ProjectDto project,
     Consumer<ProjectAlmSettingDto>... populators) {
     return insertProjectAlmSetting(newAzureProjectAlmSettingDto(azureAlmSetting, project), azureAlmSetting.getKey(),
-      project.getName(), populators);
+      project.getName(), project.getKey(), populators);
   }
 
   @SafeVarargs
   public final ProjectAlmSettingDto insertGitlabProjectAlmSetting(AlmSettingDto gitlabAlmSetting, ProjectDto project,
     Consumer<ProjectAlmSettingDto>... populators) {
     return insertProjectAlmSetting(newGitlabProjectAlmSettingDto(gitlabAlmSetting, project), gitlabAlmSetting.getKey(),
-      project.getName(), populators);
+      project.getName(), project.getKey(), populators);
   }
 
   @SafeVarargs
   public final ProjectAlmSettingDto insertBitbucketCloudProjectAlmSetting(AlmSettingDto bbCloudAlmSetting, ProjectDto project,
     Consumer<ProjectAlmSettingDto>... populators) {
     return insertProjectAlmSetting(newBitbucketCloudProjectAlmSettingDto(bbCloudAlmSetting, project), bbCloudAlmSetting.getKey(),
-      project.getName(), populators);
+      project.getName(),  project.getKey(), populators);
   }
 
   @SafeVarargs
   public final ProjectAlmSettingDto insertBitbucketProjectAlmSetting(AlmSettingDto bitbucketAlmSetting,
     ProjectDto project, Consumer<ProjectAlmSettingDto>... populators) {
     return insertProjectAlmSetting(newBitbucketProjectAlmSettingDto(bitbucketAlmSetting, project),
-      bitbucketAlmSetting.getKey(), project.getName(), populators);
+      bitbucketAlmSetting.getKey(), project.getName(), project.getKey(), populators);
   }
 
   @SafeVarargs
   private final ProjectAlmSettingDto insertProjectAlmSetting(ProjectAlmSettingDto dto, String key, String projectName,
-    Consumer<ProjectAlmSettingDto>... populators) {
+    String projectKey, Consumer<ProjectAlmSettingDto>... populators) {
     stream(populators).forEach(p -> p.accept(dto));
-    db.getDbClient().projectAlmSettingDao().insertOrUpdate(db.getSession(), dto, key, projectName);
+    db.getDbClient().projectAlmSettingDao().insertOrUpdate(db.getSession(), dto, key, projectName, projectKey);
     db.commit();
     return dto;
   }
-- 
cgit v1.2.3