From 638b7fd2ad828c4e0776d0a5332d248ddfd22390 Mon Sep 17 00:00:00 2001
From: Lukasz Jarocki <lukasz.jarocki@sonarsource.com>
Date: Thu, 22 Jun 2023 12:16:00 +0200
Subject: SONAR-19556 updated webhooks to not rely on component_uuid

---
 .../java/org/sonar/db/webhook/WebhookDeliveryDbTester.java          | 2 +-
 .../java/org/sonar/db/webhook/WebhookDeliveryTesting.java           | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

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

diff --git a/server/sonar-db-dao/src/testFixtures/java/org/sonar/db/webhook/WebhookDeliveryDbTester.java b/server/sonar-db-dao/src/testFixtures/java/org/sonar/db/webhook/WebhookDeliveryDbTester.java
index 036872b5be8..59d8de1651f 100644
--- a/server/sonar-db-dao/src/testFixtures/java/org/sonar/db/webhook/WebhookDeliveryDbTester.java
+++ b/server/sonar-db-dao/src/testFixtures/java/org/sonar/db/webhook/WebhookDeliveryDbTester.java
@@ -54,7 +54,7 @@ public class WebhookDeliveryDbTester {
     WebhookDeliveryDto dto = newDto();
     stream(dtoPopulators).forEach(dtoPopulator -> dtoPopulator.accept(dto));
     String projectUuid = webhook.getProjectUuid();
-    dto.setComponentUuid(Objects.requireNonNull(projectUuid, "Project uuid of webhook cannot be null"));
+    dto.setProjectUuid(Objects.requireNonNull(projectUuid, "Project uuid of webhook cannot be null"));
     dto.setWebhookUuid(webhook.getUuid());
     dbTester.getDbClient().webhookDeliveryDao().insert(dbTester.getSession(), dto);
     dbTester.getSession().commit();
diff --git a/server/sonar-db-dao/src/testFixtures/java/org/sonar/db/webhook/WebhookDeliveryTesting.java b/server/sonar-db-dao/src/testFixtures/java/org/sonar/db/webhook/WebhookDeliveryTesting.java
index ae149ffefc9..3df5dae9936 100644
--- a/server/sonar-db-dao/src/testFixtures/java/org/sonar/db/webhook/WebhookDeliveryTesting.java
+++ b/server/sonar-db-dao/src/testFixtures/java/org/sonar/db/webhook/WebhookDeliveryTesting.java
@@ -39,11 +39,11 @@ public class WebhookDeliveryTesting {
    * Build a {@link WebhookDeliveryDto} with all mandatory fields.
    * Optional fields are kept null.
    */
-  public static WebhookDeliveryDto newDto(String uuid, String webhookUuid, String componentUuid, String ceTaskUuid) {
+  public static WebhookDeliveryDto newDto(String uuid, String webhookUuid, String projectUuid, String ceTaskUuid) {
     return newDto()
       .setUuid(uuid)
       .setWebhookUuid(webhookUuid)
-      .setComponentUuid(componentUuid)
+      .setProjectUuid(projectUuid)
       .setCeTaskUuid(ceTaskUuid);
   }
 
@@ -51,7 +51,7 @@ public class WebhookDeliveryTesting {
     return new WebhookDeliveryDto()
       .setUuid(Uuids.createFast())
       .setWebhookUuid(randomAlphanumeric(40))
-      .setComponentUuid(randomAlphanumeric(40))
+      .setProjectUuid(randomAlphanumeric(40))
       .setCeTaskUuid(randomAlphanumeric(40))
       .setAnalysisUuid(randomAlphanumeric(40))
       .setName(randomAlphanumeric(10))
-- 
cgit v1.2.3