From 2db8cb268c1332255796028044c65ae036fcaeee Mon Sep 17 00:00:00 2001
From: Lukasz Jarocki <lukasz.jarocki@sonarsource.com>
Date: Tue, 9 May 2023 09:18:18 +0200
Subject: [PATCH] SONAR-18860 Remove usage of main branch project uuid from
 import/export of a project

---
 .../component/ExportComponentsStep.java       |  3 +-
 .../src/main/protobuf/project_dump.proto      |  2 +-
 .../update_authorization_date-result.xml      | 37 -------------------
 .../update_authorization_date.xml             | 37 -------------------
 4 files changed, 2 insertions(+), 77 deletions(-)
 delete mode 100644 server/sonar-db-dao/src/it/resources/org/sonar/db/component/ResourceDaoIT/update_authorization_date-result.xml
 delete mode 100644 server/sonar-db-dao/src/it/resources/org/sonar/db/component/ResourceDaoIT/update_authorization_date.xml

diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectexport/component/ExportComponentsStep.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectexport/component/ExportComponentsStep.java
index 1c1f137b214..eded9dd12d1 100644
--- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectexport/component/ExportComponentsStep.java
+++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectexport/component/ExportComponentsStep.java
@@ -45,7 +45,7 @@ public class ExportComponentsStep implements ComputationStep {
   private static final String QUERY = "select" +
     " p.uuid, p.qualifier, p.uuid_path, p.kee, p.name," +
     " p.description, p.scope, p.language, p.long_name, p.path," +
-    " p.deprecated_kee, p.branch_uuid, p.main_branch_project_uuid" +
+    " p.deprecated_kee, p.branch_uuid" +
     " from components p" +
     " join components pp on pp.uuid = p.branch_uuid" +
     " join project_branches pb on pb.uuid = pp.uuid" +
@@ -92,7 +92,6 @@ public class ExportComponentsStep implements ComputationStep {
           .setPath(defaultString(getString(rs, 10)))
           .setDeprecatedKey(defaultString(getString(rs, 11)))
           .setProjectUuid(getString(rs, 12))
-          .setMainBranchProjectUuid(defaultString(getString(rs, 13)))
           .build();
         output.write(component);
         ref++;
diff --git a/server/sonar-ce-task-projectanalysis/src/main/protobuf/project_dump.proto b/server/sonar-ce-task-projectanalysis/src/main/protobuf/project_dump.proto
index 020650d5513..d18b27cd1df 100644
--- a/server/sonar-ce-task-projectanalysis/src/main/protobuf/project_dump.proto
+++ b/server/sonar-ce-task-projectanalysis/src/main/protobuf/project_dump.proto
@@ -34,7 +34,7 @@ message Component {
   reserved 14; // module_uuid_path
   string deprecated_key = 15;
   string project_uuid = 16;
-  string main_branch_project_uuid = 17;
+  reserved 17;
 }
 
 message Branch {
diff --git a/server/sonar-db-dao/src/it/resources/org/sonar/db/component/ResourceDaoIT/update_authorization_date-result.xml b/server/sonar-db-dao/src/it/resources/org/sonar/db/component/ResourceDaoIT/update_authorization_date-result.xml
deleted file mode 100644
index 637ab8ecaf9..00000000000
--- a/server/sonar-db-dao/src/it/resources/org/sonar/db/component/ResourceDaoIT/update_authorization_date-result.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<dataset>
-
-  <projects organization_uuid="org1"
-            id="1"
-            uuid="ABCD"
-            uuid_path="NOT_USED"
-            project_uuid="ABCD"
-            main_branch_project_uuid="[null]"
-            scope="PRJ"
-            qualifier="TRK"
-            kee="old key"
-            name="old name"
-            description="old name"
-            private="[false]"
-            tags="[null]"
-            long_name="old long name"
-            enabled="[false]"
-            language="old"
-            copy_component_uuid="uuid_2"
-            developer_uuid="uuid_3"
-            created_at="[null]"
-            path="/old/foo/bar"
-            deprecated_kee="old deprecated key"
-            authorization_updated_at="[null]"
-            b_changed="[false]"
-            b_copy_component_uuid="[null]"
-            b_description="[null]"
-            b_enabled="[false]"
-            b_uuid_path="[null]"
-            b_language="[null]"
-            b_long_name="[null]"
-            b_name="[null]"
-            b_path="[null]"
-            b_qualifier="[null]"
-  />
-
-</dataset>
diff --git a/server/sonar-db-dao/src/it/resources/org/sonar/db/component/ResourceDaoIT/update_authorization_date.xml b/server/sonar-db-dao/src/it/resources/org/sonar/db/component/ResourceDaoIT/update_authorization_date.xml
deleted file mode 100644
index 637ab8ecaf9..00000000000
--- a/server/sonar-db-dao/src/it/resources/org/sonar/db/component/ResourceDaoIT/update_authorization_date.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<dataset>
-
-  <projects organization_uuid="org1"
-            id="1"
-            uuid="ABCD"
-            uuid_path="NOT_USED"
-            project_uuid="ABCD"
-            main_branch_project_uuid="[null]"
-            scope="PRJ"
-            qualifier="TRK"
-            kee="old key"
-            name="old name"
-            description="old name"
-            private="[false]"
-            tags="[null]"
-            long_name="old long name"
-            enabled="[false]"
-            language="old"
-            copy_component_uuid="uuid_2"
-            developer_uuid="uuid_3"
-            created_at="[null]"
-            path="/old/foo/bar"
-            deprecated_kee="old deprecated key"
-            authorization_updated_at="[null]"
-            b_changed="[false]"
-            b_copy_component_uuid="[null]"
-            b_description="[null]"
-            b_enabled="[false]"
-            b_uuid_path="[null]"
-            b_language="[null]"
-            b_long_name="[null]"
-            b_name="[null]"
-            b_path="[null]"
-            b_qualifier="[null]"
-  />
-
-</dataset>
-- 
2.39.5