delete component ids from the issues table

server/sonar-server/src/main/java/org/sonar/core/computation/dbcleaner/ProjectCleaner.java

@@ -34,7 +34,6 @@
 import org.sonar.server.search.IndexClient;
 
 import javax.annotation.Nullable;
-
 import java.util.Date;
 
 import static org.sonar.core.purge.PurgeConfiguration.newDefaultPurgeConfiguration;
@@ -50,7 +49,7 @@ public class ProjectCleaner implements ServerComponent {
   private final IndexClient indexClient;
 
   public ProjectCleaner(PurgeDao purgeDao, DefaultPeriodCleaner periodCleaner, PurgeProfiler profiler, PurgeListener purgeListener,
-    ProjectSettingsFactory projectSettingsFactory, IndexClient indexClient) {
+                        ProjectSettingsFactory projectSettingsFactory, IndexClient indexClient) {
     this.purgeDao = purgeDao;
     this.periodCleaner = periodCleaner;
     this.profiler = profiler;
@@ -64,9 +63,9 @@ public ProjectCleaner purge(DbSession session, IdUuidPair idUuidPair) {
     profiler.reset();
 
     Settings settings = projectSettingsFactory.newProjectSettings(session, idUuidPair.getId());
-    PurgeConfiguration configuration = newDefaultPurgeConfiguration(settings, idUuidPair.getId());
+    PurgeConfiguration configuration = newDefaultPurgeConfiguration(settings, idUuidPair);
 
-    cleanHistoricalData(session, configuration.rootProjectId(), settings);
+    cleanHistoricalData(session, configuration.rootProjectIdUuid().getId(), settings);
     doPurge(session, configuration);
 
     deleteIndexedIssuesBefore(idUuidPair.getUuid(), configuration.maxLiveDateOfClosedIssues());
@@ -105,7 +104,7 @@ private void doPurge(DbSession session, PurgeConfiguration configuration) {
       purgeDao.purge(session, configuration, purgeListener);
     } catch (Exception e) {
       // purge errors must no fail the report analysis
-      LOG.error("Fail to purge data [id=" + configuration.rootProjectId() + "]", e);
+      LOG.error("Fail to purge data [id=" + configuration.rootProjectIdUuid().getId() + "]", e);
     }
   }
 }

server/sonar-server/src/main/java/org/sonar/server/computation/AnalysisReportService.java

@@ -137,7 +137,6 @@ private DefaultIssue setFieldDiffs(DefaultIssue issue, String diffFields, Date a
 
   private DefaultIssue setComponent(DefaultIssue issue, @Nullable ReportComponent component) {
     if (component != null) {
-      issue.setComponentId((long) component.id());
       issue.setComponentUuid(component.uuid());
     }
     return issue;

server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistIssuesStep.java

@@ -70,11 +70,11 @@ public void execute(ComputationContext context) {
         boolean saved = false;
         if (issue.isNew()) {
           Integer ruleId = ruleCache.get(issue.ruleKey()).getId();
-          mapper.insert(IssueDto.toDtoForComputationInsert(issue, issue.componentId(), context.getProject().getId(), ruleId, system2.now()));
+          mapper.insert(IssueDto.toDtoForComputationInsert(issue, ruleId, system2.now()));
           count++;
           saved = true;
         } else if (issue.isChanged()) {
-          IssueDto dto = IssueDto.toDtoForUpdate(issue, context.getProject().getId(), system2.now());
+          IssueDto dto = IssueDto.toDtoForUpdate(issue, system2.now());
           if (Issue.STATUS_CLOSED.equals(issue.status()) || issue.selectedAt() == null) {
             // Issue is closed by scan or changed by end-user
             mapper.update(dto);

server/sonar-server/src/main/java/org/sonar/server/issue/ServerIssueStorage.java

@@ -56,7 +56,7 @@ protected void doInsert(DbSession session, long now, DefaultIssue issue) {
 
   @Override
   protected void doUpdate(DbSession session, long now, DefaultIssue issue) {
-    IssueDto dto = IssueDto.toDtoForUpdate(issue, project(session, issue).getId(), now);
+    IssueDto dto = IssueDto.toDtoForUpdate(issue, now);
 
     dbClient.issueDao().update(session, dto);
   }

server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueResultSetIterator.java

@@ -80,8 +80,8 @@ class IssueResultSetIterator extends ResultSetIterator<IssueDoc> {
 
   private static final String SQL_ALL = "select " + StringUtils.join(FIELDS, ",") + " from issues i " +
     "inner join rules r on r.id=i.rule_id " +
-    "inner join projects p on p.id=i.component_id " +
-    "inner join projects root on root.id=i.root_component_id";
+    "inner join projects p on p.uuid=i.component_uuid " +
+    "inner join projects root on root.uuid=i.project_uuid";
 
   private static final String SQL_AFTER_DATE = SQL_ALL + " where i.updated_at>?";
 

server/sonar-server/src/test/java/org/sonar/server/issue/ServerIssueStorageTest.java

@@ -124,7 +124,7 @@ public void should_insert_new_issues() throws Exception {
 
     storage.save(issue);
 
-    checkTables("should_insert_new_issues", new String[]{"id", "created_at", "updated_at", "issue_change_creation_date"}, "issues", "issue_changes");
+    checkTables("should_insert_new_issues", new String[] {"id", "created_at", "updated_at", "issue_change_creation_date"}, "issues", "issue_changes");
   }
 
   @Test
@@ -143,8 +143,9 @@ public void should_update_issues() throws Exception {
       .setNew(false)
       .setChanged(true)
 
-        // updated fields
+      // updated fields
       .setLine(5000)
+      .setProjectUuid("CDEF")
       .setDebt(Duration.create(10L))
       .setChecksum("FFFFF")
       .setAuthorLogin("simon")
@@ -160,14 +161,14 @@ public void should_update_issues() throws Exception {
       .setUpdateDate(date)
       .setCloseDate(date)
 
-        // unmodifiable fields
+      // unmodifiable fields
       .setRuleKey(RuleKey.of("xxx", "unknown"))
       .setComponentKey("struts:Action")
       .setProjectKey("struts");
 
     storage.save(issue);
 
-    checkTables("should_update_issues", new String[]{"id", "created_at", "updated_at", "issue_change_creation_date"}, "issues", "issue_changes");
+    checkTables("should_update_issues", new String[] {"id", "created_at", "updated_at", "issue_change_creation_date"}, "issues", "issue_changes");
   }
 
   static class FakeRuleFinder implements RuleFinder {

server/sonar-server/src/test/java/org/sonar/server/issue/db/IssueDaoTest.java

@@ -62,8 +62,8 @@ public void get_by_key() {
     IssueDto issue = sut.selectByKey(session, "ABCDE");
     assertThat(issue.getKee()).isEqualTo("ABCDE");
     assertThat(issue.getId()).isEqualTo(100L);
-    assertThat(issue.getComponentId()).isEqualTo(401);
-    assertThat(issue.getProjectId()).isEqualTo(399);
+    assertThat(issue.getComponentUuid()).isEqualTo("CDEF");
+    assertThat(issue.getProjectUuid()).isEqualTo("ABCD");
     assertThat(issue.getRuleId()).isEqualTo(500);
     assertThat(issue.getLanguage()).isEqualTo("java");
     assertThat(issue.getSeverity()).isEqualTo("BLOCKER");
@@ -107,8 +107,8 @@ public void find_by_action_plan() {
     IssueDto issue = issues.get(0);
     assertThat(issue.getKee()).isEqualTo("ABCDE");
     assertThat(issue.getActionPlanKey()).isEqualTo("AP-1");
-    assertThat(issue.getComponentId()).isEqualTo(401);
-    assertThat(issue.getProjectId()).isEqualTo(399);
+    assertThat(issue.getComponentUuid()).isEqualTo("CDEF");
+    assertThat(issue.getProjectUuid()).isEqualTo("ABCD");
     assertThat(issue.getRuleId()).isEqualTo(500);
     assertThat(issue.getLanguage()).isEqualTo("java");
     assertThat(issue.getSeverity()).isEqualTo("BLOCKER");

server/sonar-server/src/test/resources/org/sonar/server/batch/IssuesActionTest/return_only_manual_severity.xml

@@ -13,8 +13,8 @@
   <issues
       id="101"
       kee="FGHI"
-      component_id="401"
-      root_component_id="399"
+      component_uuid="CDEF"
+      project_uuid="ABCD"
       rule_id="501"
       severity="CRITICAL"
       manual_severity="[true]"

server/sonar-server/src/test/resources/org/sonar/server/batch/IssuesActionTest/shared.xml

@@ -1,10 +1,13 @@
 <dataset>
 
   <!-- Multi module project -->
-  <projects id="399" kee="struts" root_id="[null]" qualifier="TRK" scope="PRJ" uuid="ABCD" project_uuid="ABCD" module_uuid="[null]" module_uuid_path="." path="[null]"/>
-  <projects id="400" kee="struts-core" root_id="399" qualifier="BRC" scope="PRJ" uuid="BCDE" project_uuid="ABCD" module_uuid="ABCD" module_uuid_path=".ABCD.BCDE."
+  <projects id="399" kee="struts" root_id="[null]" qualifier="TRK" scope="PRJ" uuid="ABCD" project_uuid="ABCD"
+            module_uuid="[null]" module_uuid_path="." path="[null]"/>
+  <projects id="400" kee="struts-core" root_id="399" qualifier="BRC" scope="PRJ" uuid="BCDE" project_uuid="ABCD"
+            module_uuid="ABCD" module_uuid_path=".ABCD.BCDE."
             path="struts-core"/>
-  <projects id="401" kee="Action.java" root_id="400" qualifier="CLA" scope="PRJ" uuid="CDEF" project_uuid="ABCD" module_uuid="BCDE" module_uuid_path=".ABCD.BCDE."
+  <projects id="401" kee="Action.java" root_id="400" qualifier="CLA" scope="PRJ" uuid="CDEF" project_uuid="ABCD"
+            module_uuid="BCDE" module_uuid_path=".ABCD.BCDE."
             path="src/main/java/Action.java"/>
 
   <rules id="500" tags="[null]" system_tags="[null]" plugin_rule_key="AvoidCycle" plugin_name="squid" language="java"/>
@@ -13,8 +16,8 @@
   <issues
       id="100"
       kee="EFGH"
-      component_id="401"
-      root_component_id="399"
+      component_uuid="CDEF"
+      project_uuid="ABCD"
       rule_id="500"
       severity="BLOCKER"
       manual_severity="[false]"

server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/should_insert_new_issues-result.xml

@@ -7,10 +7,8 @@
           technical_debt="10"
           message="[null]"
           line="5000"
-          component_id="100"
           component_uuid="BCDE"
           project_uuid="ABCD"
-          root_component_id="10"
           rule_id="200"
           created_at="1000000000"
           updated_at="1000000000"

server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/should_update_issues-result.xml

@@ -12,10 +12,8 @@
           technical_debt="10"
           message="[null]"
           line="5000"
-          component_id="100"
-          component_uuid="[null]"
-          project_uuid="[null]"
-          root_component_id="10"
+          component_uuid="BCDE"
+          project_uuid="CDEF"
           rule_id="200"
           created_at="1000000000"
           updated_at="2000000000"

server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/should_update_issues.xml

@@ -19,10 +19,8 @@
           technical_debt="[null]"
           message="[null]"
           line="3000"
-          component_id="100"
-          component_uuid="[null]"
-          project_uuid="[null]"
-          root_component_id="10"
+          component_uuid="BCDE"
+          project_uuid="ABCD"
           rule_id="200"
           created_at="1000000000"
           updated_at="1000000000"
@@ -32,5 +30,5 @@
           issue_creation_date="2010-01-01"
           issue_update_date="2010-02-02"
           issue_close_date="[null]"
-    />
+      />
 </dataset>

server/sonar-server/src/test/resources/org/sonar/server/issue/db/IssueDaoTest/find_by_action_plan.xml

@@ -3,8 +3,8 @@
   <issues
       id="100"
       kee="ABCDE"
-      component_id="401"
-      root_component_id="399"
+      component_uuid="CDEF"
+      project_uuid="ABCD"
       rule_id="500"
       severity="BLOCKER"
       manual_severity="[false]"

server/sonar-server/src/test/resources/org/sonar/server/issue/db/IssueDaoTest/get_by_key.xml

@@ -3,8 +3,8 @@
   <issues
       id="100"
       kee="ABCDE"
-      component_id="401"
-      root_component_id="399"
+      component_uuid="CDEF"
+      project_uuid="ABCD"
       rule_id="500"
       severity="BLOCKER"
       manual_severity="[false]"

server/sonar-server/src/test/resources/org/sonar/server/issue/db/IssueDaoTest/insert-result.xml

@@ -2,10 +2,8 @@
   <issues
       id="100"
       kee="ABCDE"
-      component_id="123"
       component_uuid="component-uuid"
       project_uuid="project-uuid"
-      root_component_id="100"
       rule_id="200"
       severity="BLOCKER"
       manual_severity="[false]"

server/sonar-server/src/test/resources/org/sonar/server/issue/db/IssueDaoTest/select_non_closed_issues_by_module_uuid.xml

@@ -4,8 +4,8 @@
   <issues
       id="100"
       kee="100"
-      component_id="401"
-      root_component_id="399"
+      component_uuid="CDEF"
+      project_uuid="ABCD"
       rule_id="500"
       severity="BLOCKER"
       manual_severity="[false]"
@@ -30,8 +30,8 @@
   <issues
       id="101"
       kee="101"
-      component_id="402"
-      root_component_id="399"
+      component_uuid="DEFG"
+      project_uuid="ABCD"
       rule_id="501"
       severity="MAJOR"
       manual_severity="[false]"
@@ -56,8 +56,8 @@
   <issues
       id="102"
       kee="102"
-      component_id="402"
-      root_component_id="399"
+      component_uuid="DEFG"
+      project_uuid="ABCD"
       rule_id="501"
       severity="MAJOR"
       manual_severity="[false]"
@@ -82,8 +82,8 @@
   <issues
       id="103"
       kee="103"
-      component_id="400"
-      root_component_id="399"
+      component_uuid="BCDE"
+      project_uuid="ABCD"
       rule_id="501"
       severity="MAJOR"
       manual_severity="[false]"
@@ -108,8 +108,8 @@
   <issues
       id="104"
       kee="104"
-      component_id="399"
-      root_component_id="399"
+      component_uuid="ABCD"
+      project_uuid="ABCD"
       rule_id="501"
       severity="MAJOR"
       manual_severity="[false]"
@@ -134,8 +134,8 @@
   <issues
       id="1000"
       kee="1000"
-      component_id="1001"
-      root_component_id="1000"
+      component_uuid="EDCB"
+      project_uuid="DBCA"
       rule_id="500"
       severity="BLOCKER"
       manual_severity="[true]"

server/sonar-server/src/test/resources/org/sonar/server/issue/db/IssueDaoTest/select_non_closed_issues_by_project_uuid.xml

@@ -4,8 +4,8 @@
   <issues
       id="100"
       kee="100"
-      component_id="401"
-      root_component_id="399"
+      component_uuid="CDEF"
+      project_uuid="ABCD"
       rule_id="500"
       severity="BLOCKER"
       manual_severity="[false]"
@@ -30,8 +30,8 @@
   <issues
       id="101"
       kee="101"
-      component_id="402"
-      root_component_id="399"
+      component_uuid="DEFG"
+      project_uuid="ABCD"
       rule_id="501"
       severity="MAJOR"
       manual_severity="[false]"
@@ -56,8 +56,8 @@
   <issues
       id="102"
       kee="102"
-      component_id="402"
-      root_component_id="399"
+      component_uuid="DEFG"
+      project_uuid="ABCD"
       rule_id="501"
       severity="MAJOR"
       manual_severity="[false]"
@@ -82,8 +82,8 @@
   <issues
       id="103"
       kee="103"
-      component_id="400"
-      root_component_id="399"
+      component_uuid="BCDE"
+      project_uuid="ABCD"
       rule_id="501"
       severity="MAJOR"
       manual_severity="[false]"
@@ -108,8 +108,8 @@
   <issues
       id="104"
       kee="104"
-      component_id="399"
-      root_component_id="399"
+      component_uuid="ABCD"
+      project_uuid="ABCD"
       rule_id="501"
       severity="MAJOR"
       manual_severity="[false]"
@@ -134,8 +134,8 @@
   <issues
       id="1000"
       kee="1000"
-      component_id="1001"
-      root_component_id="1000"
+      component_uuid="EDCB"
+      project_uuid="DBCA"
       rule_id="500"
       severity="BLOCKER"
       manual_severity="[true]"