issues - add component and project uuids to issues table

23 files changed, 190 insertions, 70 deletions

diff --git a/sonar-core/src/main/java/org/sonar/core/issue/db/IssueDto.java b/sonar-core/src/main/java/org/sonar/core/issue/db/IssueDto.java
index 5c6c46ed641..4b0b0db2ba6 100644
--- a/sonar-core/src/main/java/org/sonar/core/issue/db/IssueDto.java
+++ b/sonar-core/src/main/java/org/sonar/core/issue/db/IssueDto.java
@@ -561,7 +561,7 @@ public final class IssueDto implements Serializable {
   /**
    * On batch side, component keys and uuid are useless
    */
-  public static IssueDto toDtoForBatchInsert(DefaultIssue issue, long componentId, long projectId, int ruleId, long now) {
+  public static IssueDto toDtoForComputationInsert(DefaultIssue issue, long componentId, long projectId, int ruleId, long now) {
     return new IssueDto()
       .setKee(issue.key())
       .setLine(issue.line())
@@ -603,8 +603,8 @@ public final class IssueDto implements Serializable {
   /**
    * On server side, we need component keys and uuid
    */
-  public static IssueDto toDtoForServerInsert(DefaultIssue issue, ComponentDto component, ComponentDto project, Integer ruleId, long now) {
-    return toDtoForBatchInsert(issue, component.getId(), project.getId(), ruleId, now)
+  public static IssueDto toDtoForServerInsert(DefaultIssue issue, ComponentDto component, ComponentDto project, int ruleId, long now) {
+    return toDtoForComputationInsert(issue, component.getId(), project.getId(), ruleId, now)
       .setComponent(component)
       .setProject(project);
   }
diff --git a/sonar-core/src/main/java/org/sonar/core/persistence/DatabaseVersion.java b/sonar-core/src/main/java/org/sonar/core/persistence/DatabaseVersion.java
index d45867e74e0..f51fae850ba 100644
--- a/sonar-core/src/main/java/org/sonar/core/persistence/DatabaseVersion.java
+++ b/sonar-core/src/main/java/org/sonar/core/persistence/DatabaseVersion.java
@@ -33,7 +33,7 @@ import java.util.List;
  */
 public class DatabaseVersion implements BatchComponent, ServerComponent {
 
-  public static final int LAST_VERSION = 770;
+  public static final int LAST_VERSION = 772;
 
   /**
    * List of all the tables.n
diff --git a/sonar-core/src/main/resources/org/sonar/core/issue/db/IssueMapper.xml b/sonar-core/src/main/resources/org/sonar/core/issue/db/IssueMapper.xml
index bd1a61b84d7..fd487317b1f 100644
--- a/sonar-core/src/main/resources/org/sonar/core/issue/db/IssueMapper.xml
+++ b/sonar-core/src/main/resources/org/sonar/core/issue/db/IssueMapper.xml
@@ -71,11 +71,17 @@
     INSERT INTO issues (kee, component_id, root_component_id, rule_id, action_plan_key, severity, manual_severity,
     message, line, effort_to_fix, technical_debt, status, tags,
     resolution, checksum, reporter, assignee, author_login, issue_attributes, issue_creation_date, issue_update_date,
-    issue_close_date, created_at, updated_at)
-    VALUES (#{kee,jdbcType=VARCHAR}, #{componentId,jdbcType=BIGINT}, #{projectId,jdbcType=BIGINT}, #{ruleId,jdbcType=INTEGER}, #{actionPlanKey,jdbcType=VARCHAR}, #{severity,jdbcType=VARCHAR}, #{manualSeverity,jdbcType=BOOLEAN},
-    #{message,jdbcType=VARCHAR}, #{line,jdbcType=INTEGER}, #{effortToFix,jdbcType=DOUBLE}, #{debt,jdbcType=INTEGER}, #{status,jdbcType=VARCHAR}, #{tagsString,jdbcType=VARCHAR},
-    #{resolution,jdbcType=VARCHAR}, #{checksum,jdbcType=VARCHAR}, #{reporter,jdbcType=VARCHAR}, #{assignee,jdbcType=VARCHAR}, #{authorLogin,jdbcType=VARCHAR}, #{issueAttributes,jdbcType=VARCHAR}, #{issueCreationDate,jdbcType=TIMESTAMP},
-    #{issueUpdateDate,jdbcType=TIMESTAMP}, #{issueCloseDate,jdbcType=TIMESTAMP}, #{createdAt,jdbcType=BIGINT}, #{updatedAt,jdbcType=BIGINT})
+    issue_close_date, created_at, updated_at, component_uuid, project_uuid)
+    VALUES (#{kee,jdbcType=VARCHAR}, #{componentId,jdbcType=BIGINT}, #{projectId,jdbcType=BIGINT},
+    #{ruleId,jdbcType=INTEGER}, #{actionPlanKey,jdbcType=VARCHAR}, #{severity,jdbcType=VARCHAR},
+    #{manualSeverity,jdbcType=BOOLEAN}, #{message,jdbcType=VARCHAR}, #{line,jdbcType=INTEGER},
+    #{effortToFix,jdbcType=DOUBLE}, #{debt,jdbcType=INTEGER}, #{status,jdbcType=VARCHAR},
+    #{tagsString,jdbcType=VARCHAR}, #{resolution,jdbcType=VARCHAR}, #{checksum,jdbcType=VARCHAR},
+    #{reporter,jdbcType=VARCHAR}, #{assignee,jdbcType=VARCHAR}, #{authorLogin,jdbcType=VARCHAR},
+    #{issueAttributes,jdbcType=VARCHAR},
+    #{issueCreationDate,jdbcType=TIMESTAMP},#{issueUpdateDate,jdbcType=TIMESTAMP}, #{issueCloseDate,jdbcType=TIMESTAMP},
+    #{createdAt,jdbcType=BIGINT}, #{updatedAt,jdbcType=BIGINT},
+    #{componentUuid,jdbcType=VARCHAR}, #{projectUuid,jdbcType=VARCHAR})
   </insert>
 
   <!--
@@ -98,6 +104,7 @@
     author_login=#{authorLogin},
     tags=#{tagsString},
     root_component_id=#{projectId},
+    project_uuid=#{projectUuid},
     issue_attributes=#{issueAttributes},
     issue_creation_date=#{issueCreationDate},
     issue_update_date=#{issueUpdateDate},
@@ -126,6 +133,7 @@
     author_login=#{authorLogin},
     tags=#{tagsString},
     root_component_id=#{projectId},
+    project_uuid=#{projectUuid},
     issue_attributes=#{issueAttributes},
     issue_creation_date=#{issueCreationDate},
     issue_update_date=#{issueUpdateDate},
@@ -151,6 +159,8 @@
     i.component_id as componentId,
     i.root_component_id as projectId,
     i.rule_id as ruleId,
+    i.component_uuid as componentUuid,
+    i.project_uuid as projectUuid,
     i.action_plan_key as actionPlanKey,
     i.severity as severity,
     i.manual_severity as manualSeverity,
@@ -176,7 +186,8 @@
     p.kee as componentKey,
     root.kee as projectKey
     from issues i
-    inner join (select p.id,p.kee from projects p where (p.root_id=#{id} and p.qualifier &lt;&gt; 'BRC') or (p.id=#{id})) p on p.id=i.component_id
+    inner join (select p.id,p.kee from projects p where (p.root_id=#{id} and p.qualifier &lt;&gt; 'BRC') or
+    (p.id=#{id})) p on p.id=i.component_id
     inner join rules r on r.id=i.rule_id
     left outer join projects root on root.id=i.root_component_id
     where i.status &lt;&gt; 'CLOSED'
@@ -197,7 +208,8 @@
     r.plugin_name as ruleRepo,
     component.kee as componentKey
     FROM issues i
-    INNER JOIN (SELECT p.id,p.kee FROM projects p WHERE p.module_uuid=#{uuid} OR p.uuid=#{uuid}) component ON component.id=i.component_id
+    INNER JOIN (SELECT p.id,p.kee FROM projects p WHERE p.module_uuid=#{uuid} OR p.uuid=#{uuid}) component ON
+    component.id=i.component_id
     INNER JOIN rules r ON r.id=i.rule_id
     WHERE i.status &lt;&gt; 'CLOSED'
   </select>
diff --git a/sonar-core/src/main/resources/org/sonar/core/persistence/rows-h2.sql b/sonar-core/src/main/resources/org/sonar/core/persistence/rows-h2.sql
index 5d5fbca06b6..206704d1de6 100644
--- a/sonar-core/src/main/resources/org/sonar/core/persistence/rows-h2.sql
+++ b/sonar-core/src/main/resources/org/sonar/core/persistence/rows-h2.sql
@@ -285,6 +285,7 @@ INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('753');
 INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('754');
 INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('755');
 INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('756');
+INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('757');
 INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('758');
 INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('759');
 INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('760');
@@ -298,6 +299,8 @@ INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('767');
 INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('768');
 INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('769');
 INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('770');
+INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('771');
+INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('772');
 
 INSERT INTO USERS(ID, LOGIN, NAME, EMAIL, CRYPTED_PASSWORD, SALT, CREATED_AT, UPDATED_AT, REMEMBER_TOKEN, REMEMBER_TOKEN_EXPIRES_AT) VALUES (1, 'admin', 'Administrator', '', 'a373a0e667abb2604c1fd571eb4ad47fe8cc0878', '48bc4b0d93179b5103fd3885ea9119498e9d161b', '1418215735482', '1418215735482', null, null);
 ALTER TABLE USERS ALTER COLUMN ID RESTART WITH 2;
diff --git a/sonar-core/src/main/resources/org/sonar/core/persistence/schema-h2.ddl b/sonar-core/src/main/resources/org/sonar/core/persistence/schema-h2.ddl
index 68a4c96b538..5e1b3a7521a 100644
--- a/sonar-core/src/main/resources/org/sonar/core/persistence/schema-h2.ddl
+++ b/sonar-core/src/main/resources/org/sonar/core/persistence/schema-h2.ddl
@@ -443,7 +443,9 @@ CREATE TABLE "ISSUES" (
   "ID" BIGINT NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 1, INCREMENT BY 1),
   "KEE" VARCHAR(50) UNIQUE NOT NULL,
   "COMPONENT_ID" INTEGER NOT NULL,
+  "COMPONENT_UUID" VARCHAR(50),
   "ROOT_COMPONENT_ID" INTEGER,
+  "PROJECT_UUID" VARCHAR(50),
   "RULE_ID" INTEGER,
   "SEVERITY" VARCHAR(10),
   "MANUAL_SEVERITY" BOOLEAN NOT NULL,
@@ -660,8 +662,12 @@ CREATE UNIQUE INDEX "ISSUES_KEE" ON "ISSUES" ("KEE");
 
 CREATE INDEX "ISSUES_COMPONENT_ID" ON "ISSUES" ("COMPONENT_ID");
 
+CREATE INDEX "ISSUES_COMPONENT_UUID" ON "ISSUES" ("COMPONENT_UUID");
+
 CREATE INDEX "ISSUES_ROOT_COMPONENT_ID" ON "ISSUES" ("ROOT_COMPONENT_ID");
 
+CREATE INDEX "ISSUES_PROJECT_UUID" ON "ISSUES" ("PROJECT_UUID");
+
 CREATE INDEX "ISSUES_RULE_ID" ON "ISSUES" ("RULE_ID");
 
 CREATE INDEX "ISSUES_SEVERITY" ON "ISSUES" ("SEVERITY");
diff --git a/sonar-core/src/test/java/org/sonar/core/issue/db/IssueMapperTest.java b/sonar-core/src/test/java/org/sonar/core/issue/db/IssueMapperTest.java
index a26c27e8dde..86004c2bec9 100644
--- a/sonar-core/src/test/java/org/sonar/core/issue/db/IssueMapperTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/issue/db/IssueMapperTest.java
@@ -46,10 +46,12 @@ public class IssueMapperTest extends AbstractDaoTestCase {
   }
 
   @Test
-  public void testInsert() throws Exception {
+  public void insert() throws Exception {
     IssueDto dto = new IssueDto();
     dto.setComponentId(123l);
+    dto.setComponentUuid("component-uuid");
     dto.setProjectId(100l);
+    dto.setProjectUuid("project-uuid");
     dto.setRuleId(200);
     dto.setKee("ABCDE");
     dto.setLine(500);
@@ -75,16 +77,17 @@ public class IssueMapperTest extends AbstractDaoTestCase {
     mapper.insert(dto);
     session.commit();
 
-    checkTables("testInsert", new String[]{"id"}, "issues");
+    checkTables("testInsert", new String[] {"id"}, "issues");
   }
 
   @Test
-  public void testUpdate() throws Exception {
+  public void update() throws Exception {
     setupData("testUpdate");
 
     IssueDto dto = new IssueDto();
     dto.setComponentId(123l);
     dto.setProjectId(101l);
+    dto.setProjectUuid("project-uuid-2");
     dto.setRuleId(200);
     dto.setKee("ABCDE");
     dto.setLine(500);
@@ -110,7 +113,7 @@ public class IssueMapperTest extends AbstractDaoTestCase {
     mapper.update(dto);
     session.commit();
 
-    checkTables("testUpdate", new String[]{"id"}, "issues");
+    checkTables("testUpdate", new String[] {"id"}, "issues");
   }
 
   @Test
@@ -120,6 +123,7 @@ public class IssueMapperTest extends AbstractDaoTestCase {
     IssueDto dto = new IssueDto();
     dto.setComponentId(123l);
     dto.setProjectId(101l);
+    dto.setProjectUuid("project-uuid-2");
     dto.setRuleId(200);
     dto.setKee("ABCDE");
     dto.setLine(500);
@@ -148,7 +152,7 @@ public class IssueMapperTest extends AbstractDaoTestCase {
     assertThat(count).isEqualTo(1);
     session.commit();
 
-    checkTables("testUpdate", new String[]{"id"}, "issues");
+    checkTables("testUpdate", new String[] {"id"}, "issues");
   }
 
   @Test
@@ -158,6 +162,7 @@ public class IssueMapperTest extends AbstractDaoTestCase {
     IssueDto dto = new IssueDto();
     dto.setComponentId(123l);
     dto.setProjectId(101l);
+    dto.setProjectUuid("project-uuid-2");
     dto.setRuleId(200);
     dto.setKee("ABCDE");
     dto.setLine(500);
@@ -186,6 +191,6 @@ public class IssueMapperTest extends AbstractDaoTestCase {
     assertThat(count).isEqualTo(0);
     session.commit();
 
-    checkTables("updateBeforeSelectedDate_with_conflict", new String[]{"id"}, "issues");
+    checkTables("updateBeforeSelectedDate_with_conflict", new String[] {"id"}, "issues");
   }
 }
diff --git a/sonar-core/src/test/java/org/sonar/core/issue/db/IssueStorageTest.java b/sonar-core/src/test/java/org/sonar/core/issue/db/IssueStorageTest.java
index 4cab4dfdda2..240aa0e8596 100644
--- a/sonar-core/src/test/java/org/sonar/core/issue/db/IssueStorageTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/issue/db/IssueStorageTest.java
@@ -81,6 +81,8 @@ public class IssueStorageTest extends AbstractDaoTestCase {
       .setUpdateDate(date)
       .setCloseDate(date)
 
+      .setComponentUuid("component-uuid")
+      .setProjectUuid("project-uuid")
       .setComponentKey("struts:Action");
 
     saver.save(issue);
@@ -114,6 +116,8 @@ public class IssueStorageTest extends AbstractDaoTestCase {
       .setUpdateDate(date)
       .setCloseDate(date)
 
+      .setComponentUuid("component-uuid")
+      .setProjectUuid("project-uuid")
       .setComponentKey("struts:Action");
 
     saver.save(session, issue);
@@ -124,8 +128,8 @@ public class IssueStorageTest extends AbstractDaoTestCase {
 
   @Test
   public void server_insert_new_issues_with_session() throws Exception {
-    ComponentDto project = new ComponentDto().setId(10L);
-    ComponentDto component = new ComponentDto().setId(100L);
+    ComponentDto project = new ComponentDto().setId(10L).setUuid("project-uuid");
+    ComponentDto component = new ComponentDto().setId(100L).setUuid("component-uuid");
     FakeServerSaver saver = new FakeServerSaver(getMyBatis(), new FakeRuleFinder(), component, project);
 
     DefaultIssueComment comment = DefaultIssueComment.create("ABCDE", "emmerik", "the comment");
@@ -150,7 +154,9 @@ public class IssueStorageTest extends AbstractDaoTestCase {
       .setUpdateDate(date)
       .setCloseDate(date)
 
-      .setComponentKey("struts:Action");
+      .setComponentKey("struts:Action")
+      .setComponentUuid("component-uuid")
+      .setProjectUuid("project-uuid");
 
     saver.save(session, issue);
     session.commit();
@@ -253,7 +259,7 @@ public class IssueStorageTest extends AbstractDaoTestCase {
     @Override
     protected void doInsert(DbSession session, long now, DefaultIssue issue) {
       int ruleId = rule(issue).getId();
-      IssueDto dto = IssueDto.toDtoForBatchInsert(issue, 100l, 10l, ruleId, now);
+      IssueDto dto = IssueDto.toDtoForComputationInsert(issue, 100l, 10l, ruleId, now);
 
       session.getMapper(IssueMapper.class).insert(dto);
     }
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/testInsert-result.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/testInsert-result.xml
index de4d58f4808..4e42661eff2 100644
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/testInsert-result.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/testInsert-result.xml
@@ -3,6 +3,8 @@
       id="100"
       kee="ABCDE"
       component_id="123"
+      component_uuid="component-uuid"
+      project_uuid="project-uuid"
       root_component_id="100"
       rule_id="200"
       severity="BLOCKER"
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/testUpdate-result.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/testUpdate-result.xml
index ea66b875954..e786cee7859 100644
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/testUpdate-result.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/testUpdate-result.xml
@@ -3,6 +3,8 @@
       id="100"
       kee="ABCDE"
       component_id="123"
+      component_uuid="component-uuid"
+      project_uuid="project-uuid-2"
       root_component_id="101"
       rule_id="200"
       severity="BLOCKER"
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/testUpdate.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/testUpdate.xml
index e4bf4848927..3990d9ae5a2 100644
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/testUpdate.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/testUpdate.xml
@@ -3,6 +3,8 @@
       id="100"
       kee="ABCDE"
       component_id="123"
+      component_uuid="component-uuid"
+      project_uuid="project-uuid"
       root_component_id="100"
       rule_id="200"
       severity="INFO"
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/updateBeforeSelectedDate_with_conflict-result.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/updateBeforeSelectedDate_with_conflict-result.xml
index 1cd6e6c18b4..7035788c739 100644
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/updateBeforeSelectedDate_with_conflict-result.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/updateBeforeSelectedDate_with_conflict-result.xml
@@ -4,6 +4,8 @@
       id="100"
       kee="ABCDE"
       component_id="123"
+      component_uuid="component-uuid"
+      project_uuid="project-uuid"
       root_component_id="100"
       rule_id="200"
       severity="INFO"
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/updateBeforeSelectedDate_with_conflict.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/updateBeforeSelectedDate_with_conflict.xml
index 6de2cc7d038..8af4d4cbfc9 100644
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/updateBeforeSelectedDate_with_conflict.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/updateBeforeSelectedDate_with_conflict.xml
@@ -3,6 +3,8 @@
       id="100"
       kee="ABCDE"
       component_id="123"
+      component_uuid="component-uuid"
+      project_uuid="project-uuid"
       root_component_id="100"
       rule_id="200"
       severity="INFO"
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_insert_new_issues-result.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_insert_new_issues-result.xml
index 458ce2553c2..b30fd9374dd 100644
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_insert_new_issues-result.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_insert_new_issues-result.xml
@@ -1,27 +1,30 @@
 <dataset>
   <issues id="1" kee="ABCDE" resolution="OPEN" status="OPEN" severity="BLOCKER" manual_severity="[false]"
-      assignee="[null]"
-      author_login="[null]"
-      checksum="[null]"
-      effort_to_fix="[null]"
-      technical_debt="10"
-      message="[null]"
-      line="5000"
-      component_id="100"
-      root_component_id="10"
-      rule_id="200"
-      created_at="[null]"
-      updated_at="[null]"
-      reporter="emmerik"
-      issue_attributes="foo=bar"
-      tags="[null]"
-      action_plan_key="[null]"
-      issue_creation_date="2013-05-18"
-      issue_update_date="2013-05-18"
-      issue_close_date="2013-05-18"
+          assignee="[null]"
+          author_login="[null]"
+          checksum="[null]"
+          effort_to_fix="[null]"
+          technical_debt="10"
+          message="[null]"
+          line="5000"
+          component_id="100"
+          root_component_id="10"
+          component_uuid="component-uuid"
+          project_uuid="project-uuid"
+          rule_id="200"
+          created_at="[null]"
+          updated_at="[null]"
+          reporter="emmerik"
+          issue_attributes="foo=bar"
+          tags="[null]"
+          action_plan_key="[null]"
+          issue_creation_date="2013-05-18"
+          issue_update_date="2013-05-18"
+          issue_close_date="2013-05-18"
       />
 
-  <issue_changes id="1" kee="FGHIJ" issue_key="ABCDE" change_type="comment" user_login="emmerik" change_data="the comment"
-                 created_at="[null]" updated_at="[null]" issue_change_creation_date="[null]" />
+  <issue_changes id="1" kee="FGHIJ" issue_key="ABCDE" change_type="comment" user_login="emmerik"
+                 change_data="the comment"
+                 created_at="[null]" updated_at="[null]" issue_change_creation_date="[null]"/>
 
 </dataset>
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_resolve_conflicts_on_updates-result.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_resolve_conflicts_on_updates-result.xml
index 26b0dd5f351..e3397e3d142 100644
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_resolve_conflicts_on_updates-result.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_resolve_conflicts_on_updates-result.xml
@@ -19,6 +19,8 @@
           message="[null]"
           line="444"
           component_id="100"
+          component_uuid="component-uuid"
+          project_uuid="project-uuid"
           root_component_id="10"
           rule_id="200"
           reporter="[null]"
@@ -29,5 +31,5 @@
           issue_creation_date="2005-05-12 00:00:00.0"
           issue_update_date="2013-05-18 00:00:00.0"
           issue_close_date="[null]"
-    />
+      />
 </dataset>
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_resolve_conflicts_on_updates.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_resolve_conflicts_on_updates.xml
index b2422b190af..c2cd5033e0b 100644
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_resolve_conflicts_on_updates.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_resolve_conflicts_on_updates.xml
@@ -1,7 +1,7 @@
 <dataset>
 
   <rules tags="[null]" system_tags="[null]" id="200" name="Avoid Cycles" plugin_rule_key="AvoidCycles"
-         plugin_config_key="[null]" plugin_name="squid" />
+         plugin_config_key="[null]" plugin_name="squid"/>
 
   <projects id="10" scope="PRJ" qualifier="TRK" kee="struts" name="Struts"/>
   <projects id="100" scope="FIL" qualifier="CLA" kee="struts:Action" name="Action"/>
@@ -21,6 +21,8 @@
           message="[null]"
           line="1"
           component_id="100"
+          component_uuid="component-uuid"
+          project_uuid="project-uuid"
           root_component_id="10"
           rule_id="200"
           reporter="[null]"
@@ -31,5 +33,5 @@
           issue_creation_date="2005-05-12 00:00:00.0"
           issue_update_date="2013-05-18 00:00:00.0"
           issue_close_date="[null]"
-    />
+      />
 </dataset>
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_update_issues-result.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_update_issues-result.xml
index 9127db20d63..2cf53b1e763 100644
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_update_issues-result.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_update_issues-result.xml
@@ -13,6 +13,8 @@
           message="[null]"
           line="5000"
           component_id="100"
+          component_uuid="component-uuid"
+          project_uuid="[null]"
           root_component_id="10"
           rule_id="200"
           created_at="2013-05-18"
@@ -24,10 +26,11 @@
           issue_creation_date="2013-05-18 00:00:00.0"
           issue_update_date="2013-05-18 00:00:00.0"
           issue_close_date="2013-05-18 00:00:00.0"
-    />
+      />
 
   <issue_changes id="1" kee="FGHIJ" issue_key="ABCDE" change_type="comment" user_login="emmerik"
                  change_data="the comment" created_at="[null]" updated_at="[null]" issue_change_creation_date="[null]"/>
   <issue_changes id="2" kee="[null]" issue_key="ABCDE" change_type="diff" user_login="emmerik"
-                 change_data="severity=INFO|BLOCKER" created_at="[null]" updated_at="[null]" issue_change_creation_date="[null]"/>
+                 change_data="severity=INFO|BLOCKER" created_at="[null]" updated_at="[null]"
+                 issue_change_creation_date="[null]"/>
 </dataset>
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_update_issues.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_update_issues.xml
index 58b3f183dc4..751373bb9be 100644
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_update_issues.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_update_issues.xml
@@ -13,6 +13,8 @@
           message="[null]"
           line="3000"
           component_id="100"
+          component_uuid="component-uuid"
+          project_uuid="[null]"
           root_component_id="10"
           rule_id="200"
           created_at="1400000000000"
@@ -24,5 +26,5 @@
           issue_creation_date="2010-01-01"
           issue_update_date="2010-02-02"
           issue_close_date="[null]"
-    />
+      />
 </dataset>
diff --git a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/disable_resources_without_last_snapshot-result.xml b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/disable_resources_without_last_snapshot-result.xml
index 0404cd9fffd..cf7f9a41062 100644
--- a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/disable_resources_without_last_snapshot-result.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/disable_resources_without_last_snapshot-result.xml
@@ -57,6 +57,8 @@ What has been changed :
   <!-- Open issue on file -->
   <issues id="1" kee="ISSUE-1"
           component_id="3"
+          component_uuid="[null]"
+          project_uuid="[null]"
           root_component_id="1"
           status="CLOSED"
           issue_close_date="2014-04-09"
@@ -67,6 +69,8 @@ What has been changed :
   <!-- Open issue on directory -->
   <issues id="2" kee="ISSUE-2"
           component_id="2"
+          component_uuid="[null]"
+          project_uuid="[null]"
           root_component_id="1"
           status="CLOSED"
           issue_close_date="2014-04-09"
@@ -77,6 +81,8 @@ What has been changed :
   <!-- Open issue on project -->
   <issues id="3" kee="ISSUE-3"
           component_id="1"
+          component_uuid="[null]"
+          project_uuid="[null]"
           root_component_id="1"
           status="CLOSED"
           issue_close_date="2014-04-09"
@@ -87,6 +93,8 @@ What has been changed :
   <!-- Resolved issue on file -> not to be updated -->
   <issues id="4" kee="ISSUE-4"
           component_id="3"
+          component_uuid="[null]"
+          project_uuid="[null]"
           root_component_id="1"
           status="CLOSED"
           issue_close_date="2015-12-08"
diff --git a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/disable_resources_without_last_snapshot.xml b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/disable_resources_without_last_snapshot.xml
index b629de0324f..121c1148321 100644
--- a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/disable_resources_without_last_snapshot.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/disable_resources_without_last_snapshot.xml
@@ -49,6 +49,8 @@
   <!-- Open issue on file -->
   <issues id="1" kee="ISSUE-1"
           component_id="3"
+          component_uuid="[null]"
+          project_uuid="[null]"
           root_component_id="1"
           status="OPEN"
           issue_close_date="[null]"
@@ -59,6 +61,8 @@
   <!-- Open issue on directory -->
   <issues id="2" kee="ISSUE-2"
           component_id="2"
+          component_uuid="[null]"
+          project_uuid="[null]"
           root_component_id="1"
           status="OPEN"
           issue_close_date="[null]"
@@ -69,6 +73,8 @@
   <!-- Open issue on project -->
   <issues id="3" kee="ISSUE-3"
           component_id="1"
+          component_uuid="[null]"
+          project_uuid="[null]"
           root_component_id="1"
           status="CONFIRM"
           issue_close_date="[null]"
@@ -79,6 +85,8 @@
   <!-- Resolved issue on file -> not to be updated -->
   <issues id="4" kee="ISSUE-4"
           component_id="3"
+          component_uuid="[null]"
+          project_uuid="[null]"
           root_component_id="1"
           status="CLOSED"
           issue_close_date="2015-12-08"
diff --git a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/should_delete_all_closed_issues-result.xml b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/should_delete_all_closed_issues-result.xml
index 4b3e552e028..23d072cc1ff 100644
--- a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/should_delete_all_closed_issues-result.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/should_delete_all_closed_issues-result.xml
@@ -46,6 +46,8 @@
   <!-- old open issues -->
   <issues id="3" kee="ISSUE-3"
           component_id="1"
+          component_uuid="[null]"
+          project_uuid="[null]"
           root_component_id="1"
           status="OPEN"
           issue_close_date="[null]"
@@ -57,6 +59,8 @@
   <!-- recent open and closed issues -->
   <issues id="4" kee="ISSUE-4"
           component_id="100"
+          component_uuid="[null]"
+          project_uuid="[null]"
           root_component_id="1"
           status="OPEN"
           issue_close_date="[null]"
diff --git a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/should_delete_all_closed_issues.xml b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/should_delete_all_closed_issues.xml
index c9e3e76b6f3..401591c1b6a 100644
--- a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/should_delete_all_closed_issues.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/should_delete_all_closed_issues.xml
@@ -2,7 +2,8 @@
 
   <projects id="1" enabled="[true]" root_id="[null]" created_at="[null]"
             long_name="[null]" scope="PRJ" qualifier="TRK" kee="project" name="project"
-            description="[null]" language="java" copy_resource_id="[null]" person_id="[null]" authorization_updated_at="[null]"/>
+            description="[null]" language="java" copy_resource_id="[null]" person_id="[null]"
+            authorization_updated_at="[null]"/>
 
   <snapshots id="1"
              project_id="1" parent_snapshot_id="[null]" root_project_id="1" root_snapshot_id="[null]"
@@ -12,61 +13,92 @@
              period3_mode="[null]" period3_param="[null]" period3_date="[null]"
              period4_mode="[null]" period4_param="[null]" period4_date="[null]"
              period5_mode="[null]" period5_param="[null]" period5_date="[null]"
-             depth="[null]" scope="PRJ" qualifier="TRK" created_at="2008-12-02 13:58:00.00" build_date="2008-12-02 13:58:00.00" version="[null]" path="[null]"/>
+             depth="[null]" scope="PRJ" qualifier="TRK" created_at="2008-12-02 13:58:00.00"
+             build_date="2008-12-02 13:58:00.00" version="[null]" path="[null]"/>
 
 
   <!-- old closed issues on file and project -->
   <issues id="1" kee="ISSUE-1"
           component_id="100"
+          component_uuid="[null]"
+          project_uuid="[null]"
           root_component_id="1"
           status="CLOSED"
           issue_close_date="2010-01-01"
-          resolution="FIXED" line="200" severity="BLOCKER" reporter="perceval" assignee="arthur" rule_id="500" manual_severity="[false]"
-          message="[null]" action_plan_key="[null]" effort_to_fix="[null]" technical_debt="[null]" issue_attributes="[null]" checksum="[null]" author_login="[null]"
-          updated_at="[null]" issue_creation_date="2013-04-16" issue_update_date="2013-04-16" created_at="1400000000000"/>
-  <issue_changes id="1" kee="[null]" issue_key="ISSUE-1" created_at="[null]" updated_at="[null]" user_login="admin" change_type="comment" change_data="abc" issue_change_creation_date="[null]"/>
+          resolution="FIXED" line="200" severity="BLOCKER" reporter="perceval" assignee="arthur" rule_id="500"
+          manual_severity="[false]"
+          message="[null]" action_plan_key="[null]" effort_to_fix="[null]" technical_debt="[null]"
+          issue_attributes="[null]" checksum="[null]" author_login="[null]"
+          updated_at="[null]" issue_creation_date="2013-04-16" issue_update_date="2013-04-16"
+          created_at="1400000000000"/>
+  <issue_changes id="1" kee="[null]" issue_key="ISSUE-1" created_at="[null]" updated_at="[null]" user_login="admin"
+                 change_type="comment" change_data="abc" issue_change_creation_date="[null]"/>
 
   <issues id="2" kee="ISSUE-2"
           component_id="1"
+          component_uuid="[null]"
+          project_uuid="[null]"
           root_component_id="1"
           status="CLOSED"
           issue_close_date="2010-01-01"
-          resolution="FIXED" line="200" severity="BLOCKER" reporter="perceval" assignee="arthur" rule_id="500" manual_severity="[false]"
-          message="[null]" action_plan_key="[null]" effort_to_fix="[null]" technical_debt="[null]" issue_attributes="[null]" checksum="[null]" author_login="[null]"
-          updated_at="[null]" issue_creation_date="2013-04-16" issue_update_date="2013-04-16" created_at="1400000000000"/>
-  <issue_changes id="2" kee="[null]" issue_key="ISSUE-2" created_at="[null]" updated_at="[null]" user_login="admin" change_type="comment" change_data="abc" issue_change_creation_date="[null]"/>
+          resolution="FIXED" line="200" severity="BLOCKER" reporter="perceval" assignee="arthur" rule_id="500"
+          manual_severity="[false]"
+          message="[null]" action_plan_key="[null]" effort_to_fix="[null]" technical_debt="[null]"
+          issue_attributes="[null]" checksum="[null]" author_login="[null]"
+          updated_at="[null]" issue_creation_date="2013-04-16" issue_update_date="2013-04-16"
+          created_at="1400000000000"/>
+  <issue_changes id="2" kee="[null]" issue_key="ISSUE-2" created_at="[null]" updated_at="[null]" user_login="admin"
+                 change_type="comment" change_data="abc" issue_change_creation_date="[null]"/>
 
 
   <!-- old open issues -->
   <issues id="3" kee="ISSUE-3"
           component_id="1"
+          component_uuid="[null]"
+          project_uuid="[null]"
           root_component_id="1"
           status="OPEN"
           issue_close_date="[null]"
-          resolution="[null]" line="200" severity="BLOCKER" reporter="perceval" assignee="arthur" rule_id="500" manual_severity="[false]"
-          message="[null]" action_plan_key="[null]" effort_to_fix="[null]" technical_debt="[null]" issue_attributes="[null]" checksum="[null]" author_login="[null]"
-          updated_at="[null]" issue_creation_date="2013-04-16" issue_update_date="2013-04-16" created_at="1400000000000"/>
-  <issue_changes id="3" kee="[null]" issue_key="ISSUE-3" created_at="[null]" updated_at="[null]" user_login="admin" change_type="comment" change_data="abc" issue_change_creation_date="[null]"/>
+          resolution="[null]" line="200" severity="BLOCKER" reporter="perceval" assignee="arthur" rule_id="500"
+          manual_severity="[false]"
+          message="[null]" action_plan_key="[null]" effort_to_fix="[null]" technical_debt="[null]"
+          issue_attributes="[null]" checksum="[null]" author_login="[null]"
+          updated_at="[null]" issue_creation_date="2013-04-16" issue_update_date="2013-04-16"
+          created_at="1400000000000"/>
+  <issue_changes id="3" kee="[null]" issue_key="ISSUE-3" created_at="[null]" updated_at="[null]" user_login="admin"
+                 change_type="comment" change_data="abc" issue_change_creation_date="[null]"/>
 
   <!-- recent open and closed issues -->
   <issues id="4" kee="ISSUE-4"
           component_id="100"
+          component_uuid="[null]"
+          project_uuid="[null]"
           root_component_id="1"
           status="OPEN"
           issue_close_date="[null]"
-          resolution="[null]" line="200" severity="BLOCKER" reporter="perceval" assignee="arthur" rule_id="500" manual_severity="[false]"
-          message="[null]" action_plan_key="[null]" effort_to_fix="[null]" technical_debt="[null]" issue_attributes="[null]" checksum="[null]" author_login="[null]"
-          updated_at="[null]" issue_creation_date="2013-04-16" issue_update_date="2013-04-16" created_at="1400000000000"/>
-  <issue_changes id="4" kee="[null]" issue_key="ISSUE-4" created_at="[null]" updated_at="[null]" user_login="admin" change_type="comment" change_data="abc" issue_change_creation_date="[null]"/>
+          resolution="[null]" line="200" severity="BLOCKER" reporter="perceval" assignee="arthur" rule_id="500"
+          manual_severity="[false]"
+          message="[null]" action_plan_key="[null]" effort_to_fix="[null]" technical_debt="[null]"
+          issue_attributes="[null]" checksum="[null]" author_login="[null]"
+          updated_at="[null]" issue_creation_date="2013-04-16" issue_update_date="2013-04-16"
+          created_at="1400000000000"/>
+  <issue_changes id="4" kee="[null]" issue_key="ISSUE-4" created_at="[null]" updated_at="[null]" user_login="admin"
+                 change_type="comment" change_data="abc" issue_change_creation_date="[null]"/>
 
   <issues id="5" kee="ISSUE-5"
           component_id="100"
+          component_uuid="[null]"
+          project_uuid="[null]"
           root_component_id="1"
           status="CLOSED"
           issue_close_date="2025-01-01"
-          resolution="FIXED" line="200" severity="BLOCKER" reporter="perceval" assignee="arthur" rule_id="500" manual_severity="[false]"
-          message="[null]" action_plan_key="[null]" effort_to_fix="[null]" technical_debt="[null]" issue_attributes="[null]" checksum="[null]" author_login="[null]"
-          updated_at="[null]" issue_creation_date="2013-04-16" issue_update_date="2013-04-16" created_at="1400000000000"/>
-  <issue_changes id="5" kee="[null]" issue_key="ISSUE-5" created_at="[null]" updated_at="[null]" user_login="admin" change_type="comment" change_data="abc" issue_change_creation_date="[null]"/>
+          resolution="FIXED" line="200" severity="BLOCKER" reporter="perceval" assignee="arthur" rule_id="500"
+          manual_severity="[false]"
+          message="[null]" action_plan_key="[null]" effort_to_fix="[null]" technical_debt="[null]"
+          issue_attributes="[null]" checksum="[null]" author_login="[null]"
+          updated_at="[null]" issue_creation_date="2013-04-16" issue_update_date="2013-04-16"
+          created_at="1400000000000"/>
+  <issue_changes id="5" kee="[null]" issue_key="ISSUE-5" created_at="[null]" updated_at="[null]" user_login="admin"
+                 change_type="comment" change_data="abc" issue_change_creation_date="[null]"/>
 
 </dataset>
diff --git a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/should_delete_old_closed_issues-result.xml b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/should_delete_old_closed_issues-result.xml
index 7d2e4cd652e..95d93990575 100644
--- a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/should_delete_old_closed_issues-result.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/should_delete_old_closed_issues-result.xml
@@ -40,6 +40,8 @@
   <!-- old open issues -> do not purge -->
   <issues id="3" kee="ISSUE-3"
           component_id="1"
+          component_uuid="[null]"
+          project_uuid="[null]"
           root_component_id="1"
           status="OPEN"
           issue_close_date="[null]"
@@ -51,6 +53,8 @@
   <!-- recent open and closed issues -> do not purge -->
   <issues id="4" kee="ISSUE-4"
           component_id="100"
+          component_uuid="[null]"
+          project_uuid="[null]"
           root_component_id="1"
           status="OPEN"
           issue_close_date="[null]"
@@ -61,6 +65,8 @@
 
   <issues id="5" kee="ISSUE-5"
           component_id="100"
+          component_uuid="[null]"
+          project_uuid="[null]"
           root_component_id="1"
           status="CLOSED"
           issue_close_date="2025-01-01"
diff --git a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/should_delete_old_closed_issues.xml b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/should_delete_old_closed_issues.xml
index 0a70926c003..353e75358a3 100644
--- a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/should_delete_old_closed_issues.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/should_delete_old_closed_issues.xml
@@ -17,6 +17,8 @@
   <!-- old closed issues on file and project -> to be purged -->
   <issues id="1" kee="ISSUE-1"
           component_id="100"
+          component_uuid="[null]"
+          project_uuid="[null]"
           root_component_id="1"
           status="CLOSED"
           issue_close_date="2010-01-01"
@@ -27,6 +29,8 @@
 
   <issues id="2" kee="ISSUE-2"
           component_id="1"
+          component_uuid="[null]"
+          project_uuid="[null]"
           root_component_id="1"
           status="CLOSED"
           issue_close_date="2010-01-01"
@@ -50,6 +54,8 @@
   <!-- recent open and closed issues -> do not purge -->
   <issues id="4" kee="ISSUE-4"
           component_id="100"
+          component_uuid="[null]"
+          project_uuid="[null]"
           root_component_id="1"
           status="OPEN"
           issue_close_date="[null]"
@@ -60,6 +66,8 @@
 
   <issues id="5" kee="ISSUE-5"
           component_id="100"
+          component_uuid="[null]"
+          project_uuid="[null]"
           root_component_id="1"
           status="CLOSED"
           issue_close_date="2025-01-01"