Rename ComponentDto#getKey to ComponentDto#getDbKey

Preparing component key that will contains branch key

server/sonar-ce/src/test/java/org/sonar/ce/queue/InternalCeQueueImplTest.java

@@ -696,7 +696,7 @@ public class InternalCeQueueImplTest {
       assertThat(task.getComponentKey()).isNull();
       assertThat(task.getComponentName()).isNull();
     } else {
-      assertThat(task.getComponentKey()).isEqualTo(componentDto.key());
+      assertThat(task.getComponentKey()).isEqualTo(componentDto.getDbKey());
       assertThat(task.getComponentName()).isEqualTo(componentDto.name());
     }
     assertThat(task.getSubmitterLogin()).isEqualTo(taskSubmit.getSubmitterLogin());
@@ -713,7 +713,7 @@ public class InternalCeQueueImplTest {
   }
 
   private ComponentDto newComponentDto(String uuid) {
-    return ComponentTesting.newPublicProjectDto(dbTester.getDefaultOrganization(), uuid).setName("name_" + uuid).setKey("key_" + uuid);
+    return ComponentTesting.newPublicProjectDto(dbTester.getDefaultOrganization(), uuid).setName("name_" + uuid).setDbKey("key_" + uuid);
   }
 
   private CeTask submit(String reportType, String componentUuid) {

server/sonar-db-dao/src/main/java/org/sonar/db/component/ComponentDto.java

@@ -173,10 +173,33 @@ public class ComponentDto {
     return UUID_PATH_SPLITTER.splitToList(uuidPath);
   }
 
-  public String key() {
+  /**
+   * Used my MyBatis mapper
+   */
+  private String getKee(){
+    return kee;
+  }
+
+  /**
+   * Used my MyBatis mapper
+   */
+  private void setKee(String kee){
+    this.kee = kee;
+  }
+
+  public String getDbKey() {
     return kee;
   }
 
+  public ComponentDto setDbKey(String key) {
+    this.kee = checkComponentKey(key);
+    return this;
+  }
+
+  public String getKey() {
+    return getDbKey();
+  }
+
   public String scope() {
     return scope;
   }
@@ -341,15 +364,6 @@ public class ComponentDto {
     return this;
   }
 
-  public String getKey() {
-    return key();
-  }
-
-  public ComponentDto setKey(String key) {
-    this.kee = checkComponentKey(key);
-    return this;
-  }
-
   public boolean isRootProject() {
     return moduleUuid == null && Scopes.PROJECT.equals(scope);
   }

server/sonar-db-dao/src/main/java/org/sonar/db/issue/IssueDto.java

@@ -211,7 +211,7 @@ public final class IssueDto implements Serializable {
   }
 
   public IssueDto setComponent(ComponentDto component) {
-    this.componentKey = component.getKey();
+    this.componentKey = component.getDbKey();
     this.componentUuid = component.uuid();
     this.moduleUuid = component.moduleUuid();
     this.moduleUuidPath = component.moduleUuidPath();
@@ -220,7 +220,7 @@ public final class IssueDto implements Serializable {
   }
 
   public IssueDto setProject(ComponentDto project) {
-    this.projectKey = project.getKey();
+    this.projectKey = project.getDbKey();
     this.projectUuid = project.uuid();
     return this;
   }

server/sonar-db-dao/src/test/java/org/sonar/db/component/ComponentDaoTest.java

@@ -95,7 +95,7 @@ public class ComponentDaoTest {
     assertThat(result.moduleUuidPath()).isEqualTo("module_uuid_path_of_U1");
     assertThat(result.getRootUuid()).isEqualTo("U1");
     assertThat(result.projectUuid()).isEqualTo("U1");
-    assertThat(result.key()).isEqualTo("org.struts:struts");
+    assertThat(result.getDbKey()).isEqualTo("org.struts:struts");
     assertThat(result.path()).isEqualTo("path_of_U1");
     assertThat(result.name()).isEqualTo("Struts");
     assertThat(result.longName()).isEqualTo("Apache Struts");
@@ -120,7 +120,7 @@ public class ComponentDaoTest {
     assertThat(result.moduleUuidPath()).isEqualTo("module_uuid_path_of_U7");
     assertThat(result.getRootUuid()).isEqualTo("root_uuid_of_U7");
     assertThat(result.projectUuid()).isEqualTo("project_uuid_of_U7");
-    assertThat(result.key()).isEqualTo("DEV:anakin@skywalker.name:org.struts:struts");
+    assertThat(result.getDbKey()).isEqualTo("DEV:anakin@skywalker.name:org.struts:struts");
     assertThat(result.path()).isNull();
     assertThat(result.name()).isEqualTo("Apache Struts");
     assertThat(result.longName()).isEqualTo("Apache Struts");
@@ -169,7 +169,7 @@ public class ComponentDaoTest {
     ComponentDto result = optional.get();
     assertThat(result.getOrganizationUuid()).isEqualTo("org1");
     assertThat(result.uuid()).isEqualTo("U4");
-    assertThat(result.key()).isEqualTo("org.struts:struts-core:src/org/struts/RequestContext.java");
+    assertThat(result.getDbKey()).isEqualTo("org.struts:struts-core:src/org/struts/RequestContext.java");
     assertThat(result.path()).isEqualTo("path_of_U4");
     assertThat(result.name()).isEqualTo("RequestContext.java");
     assertThat(result.longName()).isEqualTo("org.struts.RequestContext");
@@ -203,7 +203,7 @@ public class ComponentDaoTest {
     db.prepareDbUnit(getClass(), "shared.xml");
 
     ComponentDto result = underTest.selectOrFailByKey(dbSession, "org.struts:struts");
-    assertThat(result.key()).isEqualTo("org.struts:struts");
+    assertThat(result.getDbKey()).isEqualTo("org.struts:struts");
     assertThat(result.uuid()).isEqualTo("U1");
     assertThat(result.getUuidPath()).isEqualTo("uuid_path_of_U1");
     assertThat(result.deprecatedKey()).isEqualTo("org.struts:struts");
@@ -226,7 +226,7 @@ public class ComponentDaoTest {
 
     ComponentDto result = results.get(0);
     assertThat(result).isNotNull();
-    assertThat(result.key()).isEqualTo("org.struts:struts-core:src/org/struts/RequestContext.java");
+    assertThat(result.getDbKey()).isEqualTo("org.struts:struts-core:src/org/struts/RequestContext.java");
     assertThat(result.path()).isEqualTo("path_of_U4");
     assertThat(result.name()).isEqualTo("RequestContext.java");
     assertThat(result.longName()).isEqualTo("org.struts.RequestContext");
@@ -247,7 +247,7 @@ public class ComponentDaoTest {
 
     ComponentDto result = results.get(0);
     assertThat(result).isNotNull();
-    assertThat(result.key()).isEqualTo("org.struts:struts-core:src/org/struts/RequestContext.java");
+    assertThat(result.getDbKey()).isEqualTo("org.struts:struts-core:src/org/struts/RequestContext.java");
     assertThat(result.path()).isEqualTo("path_of_U4");
     assertThat(result.name()).isEqualTo("RequestContext.java");
     assertThat(result.longName()).isEqualTo("org.struts.RequestContext");
@@ -273,7 +273,7 @@ public class ComponentDaoTest {
     assertThat(result.moduleUuidPath()).isEqualTo("module_uuid_path_of_U4");
     assertThat(result.getRootUuid()).isEqualTo("U1");
     assertThat(result.projectUuid()).isEqualTo("U1");
-    assertThat(result.key()).isEqualTo("org.struts:struts-core:src/org/struts/RequestContext.java");
+    assertThat(result.getDbKey()).isEqualTo("org.struts:struts-core:src/org/struts/RequestContext.java");
     assertThat(result.path()).isEqualTo("path_of_U4");
     assertThat(result.name()).isEqualTo("RequestContext.java");
     assertThat(result.longName()).isEqualTo("org.struts.RequestContext");
@@ -366,22 +366,22 @@ public class ComponentDaoTest {
     // Sub project of a file
     List<ComponentDto> results = underTest.selectSubProjectsByComponentUuids(dbSession, newArrayList("HIJK"));
     assertThat(results).hasSize(1);
-    assertThat(results.get(0).getKey()).isEqualTo("org.struts:struts-data");
+    assertThat(results.get(0).getDbKey()).isEqualTo("org.struts:struts-data");
 
     // Sub project of a directory
     results = underTest.selectSubProjectsByComponentUuids(dbSession, newArrayList("GHIJ"));
     assertThat(results).hasSize(1);
-    assertThat(results.get(0).getKey()).isEqualTo("org.struts:struts-data");
+    assertThat(results.get(0).getDbKey()).isEqualTo("org.struts:struts-data");
 
     // Sub project of a sub module
     results = underTest.selectSubProjectsByComponentUuids(dbSession, newArrayList("FGHI"));
     assertThat(results).hasSize(1);
-    assertThat(results.get(0).getKey()).isEqualTo("org.struts:struts");
+    assertThat(results.get(0).getDbKey()).isEqualTo("org.struts:struts");
 
     // Sub project of a module
     results = underTest.selectSubProjectsByComponentUuids(dbSession, newArrayList("EFGH"));
     assertThat(results).hasSize(1);
-    assertThat(results.get(0).getKey()).isEqualTo("org.struts:struts");
+    assertThat(results.get(0).getDbKey()).isEqualTo("org.struts:struts");
 
     // Sub project of a project
     assertThat(underTest.selectSubProjectsByComponentUuids(dbSession, newArrayList("ABCD"))).extracting("uuid").containsOnly("ABCD");
@@ -553,7 +553,7 @@ public class ComponentDaoTest {
   @Test
   public void select_provisioned() {
     OrganizationDto organization = db.organizations().insert();
-    ComponentDto provisionedProject = db.components().insertComponent(ComponentTesting.newPrivateProjectDto(organization).setKey("provisioned.project").setName("Provisioned Project"));
+    ComponentDto provisionedProject = db.components().insertComponent(ComponentTesting.newPrivateProjectDto(organization).setDbKey("provisioned.project").setName("Provisioned Project"));
     ComponentDto provisionedView = db.components().insertView(organization);
     String projectUuid = db.components().insertProjectAndSnapshot(ComponentTesting.newPrivateProjectDto(organization)).getComponentUuid();
     String disabledProjectUuid = db.components().insertProjectAndSnapshot(ComponentTesting.newPrivateProjectDto(organization).setEnabled(false)).getComponentUuid();
@@ -579,7 +579,7 @@ public class ComponentDaoTest {
       .containsOnly(provisionedProject.uuid(), provisionedView.uuid());
 
     // match key
-    assertThat(underTest.selectProvisioned(dbSession, organization.getUuid(), provisionedProject.getKey(), projectQualifiers, new RowBounds(0, 10)))
+    assertThat(underTest.selectProvisioned(dbSession, organization.getUuid(), provisionedProject.getDbKey(), projectQualifiers, new RowBounds(0, 10)))
       .extracting(ComponentDto::uuid)
       .containsExactly(provisionedProject.uuid());
     assertThat(underTest.selectProvisioned(dbSession, organization.getUuid(), "pROvisiONed.proJEcT", projectQualifiers, new RowBounds(0, 10)))
@@ -689,7 +689,7 @@ public class ComponentDaoTest {
       .setProjectUuid("ABCD")
       .setModuleUuid("EFGH")
       .setModuleUuidPath(".ABCD.EFGH.")
-      .setKey("org.struts:struts-core:src/org/struts/RequestContext.java")
+      .setDbKey("org.struts:struts-core:src/org/struts/RequestContext.java")
       .setDeprecatedKey("org.struts:struts-core:src/org/struts/RequestContext.java")
       .setName("RequestContext.java")
       .setLongName("org.struts.RequestContext")
@@ -724,7 +724,7 @@ public class ComponentDaoTest {
       .setProjectUuid("ABCD")
       .setModuleUuid("EFGH")
       .setModuleUuidPath(".ABCD.EFGH.")
-      .setKey("org.struts:struts-core:src/org/struts/RequestContext.java")
+      .setDbKey("org.struts:struts-core:src/org/struts/RequestContext.java")
       .setName("RequestContext.java")
       .setLongName("org.struts.RequestContext")
       .setQualifier("FIL")
@@ -835,13 +835,13 @@ public class ComponentDaoTest {
     underTest.updateTags(dbSession, project.setTags(newArrayList("finance", "toto", "tutu")));
     dbSession.commit();
 
-    assertThat(underTest.selectOrFailByKey(dbSession, project.key()).getTags()).containsOnly("finance", "toto", "tutu");
+    assertThat(underTest.selectOrFailByKey(dbSession, project.getDbKey()).getTags()).containsOnly("finance", "toto", "tutu");
   }
 
   @Test
   public void delete() throws Exception {
-    ComponentDto project1 = db.components().insertPrivateProject(db.getDefaultOrganization(), (t) -> t.setKey("PROJECT_1"));
-    db.components().insertPrivateProject(db.getDefaultOrganization(), (t) -> t.setKey("PROJECT_2"));
+    ComponentDto project1 = db.components().insertPrivateProject(db.getDefaultOrganization(), (t) -> t.setDbKey("PROJECT_1"));
+    db.components().insertPrivateProject(db.getDefaultOrganization(), (t) -> t.setDbKey("PROJECT_2"));
 
     underTest.delete(dbSession, project1.getId());
     dbSession.commit();
@@ -935,39 +935,39 @@ public class ComponentDaoTest {
 
   @Test
   public void selectByQuery_key_with_special_characters() {
-    db.components().insertProjectAndSnapshot(ComponentTesting.newPrivateProjectDto(db.organizations().insert()).setKey("project-_%-key"));
+    db.components().insertProjectAndSnapshot(ComponentTesting.newPrivateProjectDto(db.organizations().insert()).setDbKey("project-_%-key"));
 
     ComponentQuery query = ComponentQuery.builder().setNameOrKeyQuery("project-_%-key").setQualifiers(Qualifiers.PROJECT).build();
     List<ComponentDto> result = underTest.selectByQuery(dbSession, query, 0, 10);
 
     assertThat(result).hasSize(1);
-    assertThat(result.get(0).key()).isEqualTo("project-_%-key");
+    assertThat(result.get(0).getDbKey()).isEqualTo("project-_%-key");
   }
 
   @Test
   public void selectByQuery_filter_on_language() {
-    db.components().insertComponent(ComponentTesting.newPrivateProjectDto(db.getDefaultOrganization()).setKey("java-project-key").setLanguage("java"));
-    db.components().insertComponent(ComponentTesting.newPrivateProjectDto(db.getDefaultOrganization()).setKey("cpp-project-key").setLanguage("cpp"));
+    db.components().insertComponent(ComponentTesting.newPrivateProjectDto(db.getDefaultOrganization()).setDbKey("java-project-key").setLanguage("java"));
+    db.components().insertComponent(ComponentTesting.newPrivateProjectDto(db.getDefaultOrganization()).setDbKey("cpp-project-key").setLanguage("cpp"));
 
     ComponentQuery query = ComponentQuery.builder().setLanguage("java").setQualifiers(Qualifiers.PROJECT).build();
     List<ComponentDto> result = underTest.selectByQuery(dbSession, query, 0, 10);
 
     assertThat(result).hasSize(1);
-    assertThat(result.get(0).key()).isEqualTo("java-project-key");
+    assertThat(result.get(0).getDbKey()).isEqualTo("java-project-key");
   }
 
   @Test
   public void selectByQuery_filter_on_visibility() {
-    db.components().insertComponent(ComponentTesting.newPrivateProjectDto(db.getDefaultOrganization()).setKey("private-key"));
-    db.components().insertComponent(ComponentTesting.newPublicProjectDto(db.getDefaultOrganization()).setKey("public-key"));
+    db.components().insertComponent(ComponentTesting.newPrivateProjectDto(db.getDefaultOrganization()).setDbKey("private-key"));
+    db.components().insertComponent(ComponentTesting.newPublicProjectDto(db.getDefaultOrganization()).setDbKey("public-key"));
 
     ComponentQuery privateProjectsQuery = ComponentQuery.builder().setPrivate(true).setQualifiers(Qualifiers.PROJECT).build();
     ComponentQuery publicProjectsQuery = ComponentQuery.builder().setPrivate(false).setQualifiers(Qualifiers.PROJECT).build();
     ComponentQuery allProjectsQuery = ComponentQuery.builder().setPrivate(null).setQualifiers(Qualifiers.PROJECT).build();
 
-    assertThat(underTest.selectByQuery(dbSession, privateProjectsQuery, 0, 10)).extracting(ComponentDto::getKey).containsExactly("private-key");
-    assertThat(underTest.selectByQuery(dbSession, publicProjectsQuery, 0, 10)).extracting(ComponentDto::getKey).containsExactly("public-key");
-    assertThat(underTest.selectByQuery(dbSession, allProjectsQuery, 0, 10)).extracting(ComponentDto::getKey).containsOnly("public-key", "private-key");
+    assertThat(underTest.selectByQuery(dbSession, privateProjectsQuery, 0, 10)).extracting(ComponentDto::getDbKey).containsExactly("private-key");
+    assertThat(underTest.selectByQuery(dbSession, publicProjectsQuery, 0, 10)).extracting(ComponentDto::getDbKey).containsExactly("public-key");
+    assertThat(underTest.selectByQuery(dbSession, allProjectsQuery, 0, 10)).extracting(ComponentDto::getDbKey).containsOnly("public-key", "private-key");
   }
 
   @Test
@@ -1029,11 +1029,11 @@ public class ComponentDaoTest {
     db.components().insertProjectAndSnapshot(project);
     ComponentDto module = newModuleDto(MODULE_UUID, project);
     db.components().insertComponent(module);
-    ComponentDto file1 = newFileDto(project, null, FILE_1_UUID).setKey("file-key-1").setName("File One");
+    ComponentDto file1 = newFileDto(project, null, FILE_1_UUID).setDbKey("file-key-1").setName("File One");
     db.components().insertComponent(file1);
-    ComponentDto file2 = newFileDto(module, null, FILE_2_UUID).setKey("file-key-2").setName("File Two");
+    ComponentDto file2 = newFileDto(module, null, FILE_2_UUID).setDbKey("file-key-2").setName("File Two");
     db.components().insertComponent(file2);
-    ComponentDto file3 = newFileDto(module, null, FILE_3_UUID).setKey("file-key-3").setName("File Three");
+    ComponentDto file3 = newFileDto(module, null, FILE_3_UUID).setDbKey("file-key-3").setName("File Three");
     db.components().insertComponent(file3);
     db.commit();
 

server/sonar-db-dao/src/test/java/org/sonar/db/component/ComponentDaoWithDuplicatedKeysTest.java

@@ -49,10 +49,10 @@ public class ComponentDaoWithDuplicatedKeysTest {
   @Test
   public void select_components_having_same_key() {
     OrganizationDto organizationDto = db.organizations().insert();
-    insertProject(ComponentTesting.newPrivateProjectDto(organizationDto).setKey(PROJECT_KEY));
-    insertProject(ComponentTesting.newPrivateProjectDto(organizationDto).setKey(PROJECT_KEY));
-    insertProject(ComponentTesting.newPrivateProjectDto(organizationDto).setKey(PROJECT_KEY));
-    insertProject(ComponentTesting.newPrivateProjectDto(organizationDto).setKey("ANOTHER_PROJECT_KEY"));
+    insertProject(ComponentTesting.newPrivateProjectDto(organizationDto).setDbKey(PROJECT_KEY));
+    insertProject(ComponentTesting.newPrivateProjectDto(organizationDto).setDbKey(PROJECT_KEY));
+    insertProject(ComponentTesting.newPrivateProjectDto(organizationDto).setDbKey(PROJECT_KEY));
+    insertProject(ComponentTesting.newPrivateProjectDto(organizationDto).setDbKey("ANOTHER_PROJECT_KEY"));
 
     assertThat(underTest.selectComponentsHavingSameKeyOrderedById(db.getSession(), PROJECT_KEY)).hasSize(3);
   }

server/sonar-db-dao/src/test/java/org/sonar/db/component/ComponentDtoTest.java

@@ -32,7 +32,7 @@ public class ComponentDtoTest {
   public void setters_and_getters() {
     ComponentDto componentDto = new ComponentDto()
       .setId(1L)
-      .setKey("org.struts:struts-core:src/org/struts/RequestContext.java")
+      .setDbKey("org.struts:struts-core:src/org/struts/RequestContext.java")
       .setDeprecatedKey("org.struts:struts-core:src/org/struts/RequestContext.java")
       .setName("RequestContext.java")
       .setLongName("org.struts.RequestContext")
@@ -46,7 +46,7 @@ public class ComponentDtoTest {
       .setDeveloperUuid("uuid_6");
 
     assertThat(componentDto.getId()).isEqualTo(1L);
-    assertThat(componentDto.key()).isEqualTo("org.struts:struts-core:src/org/struts/RequestContext.java");
+    assertThat(componentDto.getDbKey()).isEqualTo("org.struts:struts-core:src/org/struts/RequestContext.java");
     assertThat(componentDto.deprecatedKey()).isEqualTo("org.struts:struts-core:src/org/struts/RequestContext.java");
     assertThat(componentDto.name()).isEqualTo("RequestContext.java");
     assertThat(componentDto.longName()).isEqualTo("org.struts.RequestContext");

server/sonar-db-dao/src/test/java/org/sonar/db/component/ComponentKeyUpdaterDaoTest.java

@@ -64,17 +64,17 @@ public class ComponentKeyUpdaterDaoTest {
   @Test
   public void updateKey_does_not_updated_inactive_components() {
     OrganizationDto organizationDto = db.organizations().insert();
-    ComponentDto project = db.components().insertComponent(newPrivateProjectDto(organizationDto, "A").setKey("my_project"));
-    ComponentDto directory = db.components().insertComponent(newDirectory(project, "/directory").setKey("my_project:directory"));
-    db.components().insertComponent(newFileDto(project, directory).setKey("my_project:directory/file"));
-    ComponentDto inactiveDirectory = db.components().insertComponent(newDirectory(project, "/inactive_directory").setKey("my_project:inactive_directory").setEnabled(false));
-    db.components().insertComponent(newFileDto(project, inactiveDirectory).setKey("my_project:inactive_directory/file").setEnabled(false));
+    ComponentDto project = db.components().insertComponent(newPrivateProjectDto(organizationDto, "A").setDbKey("my_project"));
+    ComponentDto directory = db.components().insertComponent(newDirectory(project, "/directory").setDbKey("my_project:directory"));
+    db.components().insertComponent(newFileDto(project, directory).setDbKey("my_project:directory/file"));
+    ComponentDto inactiveDirectory = db.components().insertComponent(newDirectory(project, "/inactive_directory").setDbKey("my_project:inactive_directory").setEnabled(false));
+    db.components().insertComponent(newFileDto(project, inactiveDirectory).setDbKey("my_project:inactive_directory/file").setEnabled(false));
 
     underTest.updateKey(dbSession, "A", "your_project");
     dbSession.commit();
 
     List<ComponentDto> result = dbClient.componentDao().selectAllComponentsFromProjectKey(dbSession, "your_project");
-    assertThat(result).hasSize(5).extracting(ComponentDto::getKey)
+    assertThat(result).hasSize(5).extracting(ComponentDto::getDbKey)
       .containsOnlyOnce("your_project", "your_project:directory", "your_project:directory/file", "my_project:inactive_directory", "my_project:inactive_directory/file");
   }
 
@@ -90,14 +90,14 @@ public class ComponentKeyUpdaterDaoTest {
 
   @Test
   public void bulk_update_key_does_not_update_inactive_components() {
-    ComponentDto project = db.components().insertComponent(newPrivateProjectDto(db.getDefaultOrganization(), "A").setKey("my_project"));
-    db.components().insertComponent(newModuleDto(project).setKey("my_project:module"));
-    db.components().insertComponent(newModuleDto(project).setKey("my_project:inactive_module").setEnabled(false));
+    ComponentDto project = db.components().insertComponent(newPrivateProjectDto(db.getDefaultOrganization(), "A").setDbKey("my_project"));
+    db.components().insertComponent(newModuleDto(project).setDbKey("my_project:module"));
+    db.components().insertComponent(newModuleDto(project).setDbKey("my_project:inactive_module").setEnabled(false));
 
     underTest.bulkUpdateKey(dbSession, "A", "my_", "your_");
 
     List<ComponentDto> result = dbClient.componentDao().selectAllComponentsFromProjectKey(dbSession, "your_project");
-    assertThat(result).hasSize(3).extracting(ComponentDto::getKey)
+    assertThat(result).hasSize(3).extracting(ComponentDto::getDbKey)
       .containsOnlyOnce("your_project", "your_project:module", "my_project:inactive_module");
   }
 
@@ -145,9 +145,9 @@ public class ComponentKeyUpdaterDaoTest {
   @Test
   public void updateKey_throws_IAE_when_sub_component_key_is_too_long() {
     OrganizationDto organizationDto = db.organizations().insert();
-    ComponentDto project = newPrivateProjectDto(organizationDto, "project-uuid").setKey("old-project-key");
+    ComponentDto project = newPrivateProjectDto(organizationDto, "project-uuid").setDbKey("old-project-key");
     db.components().insertComponent(project);
-    db.components().insertComponent(newFileDto(project, null).setKey("old-project-key:file"));
+    db.components().insertComponent(newFileDto(project, null).setDbKey("old-project-key:file"));
     String newLongProjectKey = Strings.repeat("a", 400);
     thrown.expect(IllegalArgumentException.class);
     thrown.expectMessage("Component key length (405) is longer than the maximum authorized (400). '" + newLongProjectKey + ":file' was provided.");
@@ -162,7 +162,7 @@ public class ComponentKeyUpdaterDaoTest {
     thrown.expect(IllegalArgumentException.class);
     thrown.expectMessage("Malformed key for 'my?project?key'. Allowed characters are alphanumeric, '-', '_', '.' and ':', with at least one non-digit.");
 
-    underTest.bulkUpdateKey(dbSession, project.uuid(), project.key(), "my?project?key");
+    underTest.bulkUpdateKey(dbSession, project.uuid(), project.getDbKey(), "my?project?key");
   }
 
   @Test
@@ -179,8 +179,8 @@ public class ComponentKeyUpdaterDaoTest {
   @Test
   public void check_component_keys_checks_inactive_components() {
     OrganizationDto organizationDto = db.organizations().insert();
-    db.components().insertComponent(ComponentTesting.newPrivateProjectDto(organizationDto).setKey("my-project"));
-    db.components().insertComponent(ComponentTesting.newPrivateProjectDto(organizationDto).setKey("your-project").setEnabled(false));
+    db.components().insertComponent(ComponentTesting.newPrivateProjectDto(organizationDto).setDbKey("my-project"));
+    db.components().insertComponent(ComponentTesting.newPrivateProjectDto(organizationDto).setDbKey("your-project").setEnabled(false));
 
     Map<String, Boolean> result = underTest.checkComponentKeys(dbSession, newArrayList("my-project", "your-project", "new-project"));
 
@@ -202,9 +202,9 @@ public class ComponentKeyUpdaterDaoTest {
 
   @Test
   public void simulate_bulk_update_key_do_not_return_disable_components() {
-    ComponentDto project = db.components().insertComponent(newPrivateProjectDto(db.getDefaultOrganization(), "A").setKey("project"));
-    db.components().insertComponent(newModuleDto(project).setKey("project:enabled-module"));
-    db.components().insertComponent(newModuleDto(project).setKey("project:disabled-module").setEnabled(false));
+    ComponentDto project = db.components().insertComponent(newPrivateProjectDto(db.getDefaultOrganization(), "A").setDbKey("project"));
+    db.components().insertComponent(newModuleDto(project).setDbKey("project:enabled-module"));
+    db.components().insertComponent(newModuleDto(project).setDbKey("project:disabled-module").setEnabled(false));
 
     Map<String, String> result = underTest.simulateBulkUpdateKey(dbSession, "A", "project", "new-project");
 
@@ -216,9 +216,9 @@ public class ComponentKeyUpdaterDaoTest {
   @Test
   public void simulate_bulk_update_key_fails_if_invalid_componentKey() {
     OrganizationDto organizationDto = db.organizations().insert();
-    ComponentDto project = db.components().insertComponent(newPrivateProjectDto(organizationDto, "A").setKey("project"));
-    db.components().insertComponent(newModuleDto(project).setKey("project:enabled-module"));
-    db.components().insertComponent(newModuleDto(project).setKey("project:disabled-module").setEnabled(false));
+    ComponentDto project = db.components().insertComponent(newPrivateProjectDto(organizationDto, "A").setDbKey("project"));
+    db.components().insertComponent(newModuleDto(project).setDbKey("project:enabled-module"));
+    db.components().insertComponent(newModuleDto(project).setDbKey("project:disabled-module").setEnabled(false));
 
     thrown.expect(IllegalArgumentException.class);
 

server/sonar-db-dao/src/test/java/org/sonar/db/component/ComponentTesting.java

@@ -44,7 +44,7 @@ public class ComponentTesting {
     String filename = "NAME_" + fileUuid;
     String path = directory != null ? directory.path() + "/" + filename : module.path() + "/" + filename;
     return newChildComponent(fileUuid, module, directory == null ? module : directory)
-      .setKey("KEY_" + fileUuid)
+      .setDbKey("KEY_" + fileUuid)
       .setName(filename)
       .setLongName(path)
       .setScope(Scopes.FILE)
@@ -60,7 +60,7 @@ public class ComponentTesting {
 
   public static ComponentDto newDirectory(ComponentDto module, String uuid, String path) {
     return newChildComponent(uuid, module, module)
-      .setKey(!path.equals("/") ? module.getKey() + ":" + path : module.getKey() + ":/")
+      .setDbKey(!path.equals("/") ? module.getDbKey() + ":" + path : module.getDbKey() + ":/")
       .setName(path)
       .setLongName(path)
       .setPath(path)
@@ -70,7 +70,7 @@ public class ComponentTesting {
 
   public static ComponentDto newSubView(ComponentDto viewOrSubView, String uuid, String key) {
     return newChildComponent(uuid, viewOrSubView, viewOrSubView)
-      .setKey(key)
+      .setDbKey(key)
       .setName(key)
       .setLongName(key)
       .setScope(Scopes.PROJECT)
@@ -85,7 +85,7 @@ public class ComponentTesting {
   public static ComponentDto newModuleDto(String uuid, ComponentDto parentModuleOrProject) {
     return newChildComponent(uuid, parentModuleOrProject, parentModuleOrProject)
       .setModuleUuidPath(parentModuleOrProject.moduleUuidPath() + uuid + UUID_PATH_SEPARATOR)
-      .setKey("KEY_" + uuid)
+      .setDbKey("KEY_" + uuid)
       .setName("NAME_" + uuid)
       .setLongName("LONG_NAME_" + uuid)
       .setPath("module")
@@ -122,7 +122,7 @@ public class ComponentTesting {
       .setProjectUuid(uuid)
       .setModuleUuidPath(UUID_PATH_SEPARATOR + uuid + UUID_PATH_SEPARATOR)
       .setRootUuid(uuid)
-      .setKey("KEY_" + uuid)
+      .setDbKey("KEY_" + uuid)
       .setName("NAME_" + uuid)
       .setLongName("LONG_NAME_" + uuid)
       .setDescription("DESCRIPTION_" + uuid)
@@ -162,7 +162,7 @@ public class ComponentTesting {
     checkNotNull(project.getId(), "The project need to be persisted before creating this technical project.");
     return newChildComponent(uuid, view, view)
       .setUuid(uuid)
-      .setKey(view.key() + project.key())
+      .setDbKey(view.getDbKey() + project.getDbKey())
       .setName(project.name())
       .setLongName(project.longName())
       .setCopyComponentUuid(project.uuid())

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

@@ -182,8 +182,8 @@ public class IssueDaoTest {
 
   private static IssueDto newIssueDto(String key) {
     IssueDto dto = new IssueDto();
-    dto.setComponent(new ComponentDto().setKey("struts:Action").setId(123L).setUuid("component-uuid"));
-    dto.setProject(new ComponentDto().setKey("struts").setId(100L).setUuid("project-uuid"));
+    dto.setComponent(new ComponentDto().setDbKey("struts:Action").setId(123L).setUuid("component-uuid"));
+    dto.setProject(new ComponentDto().setDbKey("struts").setId(100L).setUuid("project-uuid"));
     dto.setRule(RuleTesting.newRule(RuleKey.of("squid", "S001")).setId(200));
     dto.setKee(key);
     dto.setType(2);
@@ -209,8 +209,8 @@ public class IssueDaoTest {
   private void prepareTables() {
     db.rules().insertRule(RULE);
     OrganizationDto organizationDto = db.organizations().insert();
-    ComponentDto projectDto = db.components().insertPrivateProject(organizationDto, (t) -> t.setUuid(PROJECT_UUID).setKey(PROJECT_KEY));
-    db.components().insertComponent(newFileDto(projectDto).setUuid(FILE_UUID).setKey(FILE_KEY));
+    ComponentDto projectDto = db.components().insertPrivateProject(organizationDto, (t) -> t.setUuid(PROJECT_UUID).setDbKey(PROJECT_KEY));
+    db.components().insertComponent(newFileDto(projectDto).setUuid(FILE_UUID).setDbKey(FILE_KEY));
     underTest.insert(db.getSession(), newIssueDto(ISSUE_KEY1)
       .setMessage("the message")
       .setRuleId(RULE.getId())

server/sonar-db-dao/src/test/java/org/sonar/db/measure/MeasureDaoTest.java

@@ -420,7 +420,7 @@ public class MeasureDaoTest {
       .setProjectUuid("don't care")
       .setRootUuid("don't care")
       .setUuidPath("don't care")
-      .setKey("kee_" + uuid)
+      .setDbKey("kee_" + uuid)
       .setEnabled(enabled);
     db.getDbClient().componentDao().insert(db.getSession(), componentDto);
     return uuid;

server/sonar-db-dao/src/test/java/org/sonar/db/measure/ProjectMeasuresIndexerIteratorTest.java

@@ -66,7 +66,7 @@ public class ProjectMeasuresIndexerIteratorTest {
   public void return_project_measure() {
     MetricDto metric1 = insertIntMetric("ncloc");
     MetricDto metric2 = insertIntMetric("coverage");
-    ComponentDto project = ComponentTesting.newPrivateProjectDto(dbTester.getDefaultOrganization()).setKey("Project-Key").setName("Project Name").setTagsString("platform,java");
+    ComponentDto project = ComponentTesting.newPrivateProjectDto(dbTester.getDefaultOrganization()).setDbKey("Project-Key").setName("Project Name").setTagsString("platform,java");
     SnapshotDto analysis = dbTester.components().insertProjectAndSnapshot(project);
     insertMeasure(project, analysis, metric1, 10d);
     insertMeasure(project, analysis, metric2, 20d);
@@ -242,7 +242,7 @@ public class ProjectMeasuresIndexerIteratorTest {
     ProjectMeasures doc = docsById.get(project.uuid());
     assertThat(doc).isNotNull();
     assertThat(doc.getProject().getUuid()).isEqualTo(project.uuid());
-    assertThat(doc.getProject().getKey()).isNotNull().isEqualTo(project.getKey());
+    assertThat(doc.getProject().getKey()).isNotNull().isEqualTo(project.getDbKey());
     assertThat(doc.getProject().getName()).isNotNull().isEqualTo(project.name());
     assertThat(doc.getProject().getAnalysisDate()).isNotNull().isEqualTo(analysis.getCreatedAt());
   }

server/sonar-db-dao/src/test/java/org/sonar/db/property/PropertiesDaoTest.java

@@ -117,7 +117,7 @@ public class PropertiesDaoTest {
     int userId2 = insertUser("user2");
     ComponentDto projectDto = insertProject("PROJECT_A");
     long projectId = projectDto.getId();
-    String projectKey = projectDto.key();
+    String projectKey = projectDto.getDbKey();
 
     // global subscription
     insertProperty("notification.DispatcherWithGlobalSubscribers.Email", "true", null, userId2);
@@ -263,7 +263,7 @@ public class PropertiesDaoTest {
     insertProperty("project.one", "Pone", projectId, null);
     insertProperty("project.two", "Ptwo", projectId, null);
 
-    List<PropertyDto> dtos = underTest.selectProjectProperties(projectDto.key());
+    List<PropertyDto> dtos = underTest.selectProjectProperties(projectDto.getDbKey());
     assertThat(dtos)
       .hasSize(2);
     assertThatDto(findByKey(dtos, "project.one"))
@@ -282,7 +282,7 @@ public class PropertiesDaoTest {
     ComponentDto projectDto = insertProject("A");
     insertProperty("project.one", dbValue, projectDto.getId(), null);
 
-    List<PropertyDto> dtos = underTest.selectProjectProperties(projectDto.key());
+    List<PropertyDto> dtos = underTest.selectProjectProperties(projectDto.getDbKey());
     assertThat(dtos).hasSize(1);
     assertThatDto(dtos.iterator().next())
       .hasKey("project.one")
@@ -1091,7 +1091,7 @@ public class PropertiesDaoTest {
 
   private ComponentDto insertProject(String uuid) {
     String key = "project" + uuid;
-    ComponentDto project = ComponentTesting.newPrivateProjectDto(dbTester.getDefaultOrganization(), uuid).setKey(key);
+    ComponentDto project = ComponentTesting.newPrivateProjectDto(dbTester.getDefaultOrganization(), uuid).setDbKey(key);
     dbClient.componentDao().insert(session, project);
     dbTester.commit();
     return project;

server/sonar-db-dao/src/test/java/org/sonar/db/qualityprofile/QualityProfileDaoTest.java

@@ -594,8 +594,8 @@ public class QualityProfileDaoTest {
     assertThat(underTest.selectSelectedProjects(dbSession, organization, profile1, null))
       .extracting("projectId", "projectUuid", "projectKey", "projectName", "profileKey")
       .containsOnly(
-        tuple(project1.getId(), project1.uuid(), project1.key(), project1.name(), profile1.getKee()),
-        tuple(project2.getId(), project2.uuid(), project2.key(), project2.name(), profile1.getKee()));
+        tuple(project1.getId(), project1.uuid(), project1.getDbKey(), project1.name(), profile1.getKee()),
+        tuple(project2.getId(), project2.uuid(), project2.getDbKey(), project2.name(), profile1.getKee()));
 
     assertThat(underTest.selectSelectedProjects(dbSession, organization, profile1, "ect1")).hasSize(1);
     assertThat(underTest.selectSelectedProjects(dbSession, organization, profile3, null)).isEmpty();
@@ -621,8 +621,8 @@ public class QualityProfileDaoTest {
     assertThat(underTest.selectDeselectedProjects(dbSession, organization, profile1, null))
       .extracting("projectId", "projectUuid", "projectKey", "projectName", "profileKey")
       .containsExactly(
-        tuple(project2.getId(), project2.uuid(), project2.key(), project2.name(), null),
-        tuple(project3.getId(), project3.uuid(), project3.key(), project3.name(), null));
+        tuple(project2.getId(), project2.uuid(), project2.getDbKey(), project2.name(), null),
+        tuple(project3.getId(), project3.uuid(), project3.getDbKey(), project3.name(), null));
 
     assertThat(underTest.selectDeselectedProjects(dbSession, organization, profile1, "ect2")).hasSize(1);
     assertThat(underTest.selectDeselectedProjects(dbSession, organization, profile3, null)).hasSize(3);
@@ -648,9 +648,9 @@ public class QualityProfileDaoTest {
     assertThat(underTest.selectProjectAssociations(dbSession, organization, profile1, null))
       .extracting("projectId", "projectUuid", "projectKey", "projectName", "profileKey")
       .containsOnly(
-        tuple(project1.getId(), project1.uuid(), project1.key(), project1.name(), profile1.getKee()),
-        tuple(project2.getId(), project2.uuid(), project2.key(), project2.name(), null),
-        tuple(project3.getId(), project3.uuid(), project3.key(), project3.name(), null));
+        tuple(project1.getId(), project1.uuid(), project1.getDbKey(), project1.name(), profile1.getKee()),
+        tuple(project2.getId(), project2.uuid(), project2.getDbKey(), project2.name(), null),
+        tuple(project3.getId(), project3.uuid(), project3.getDbKey(), project3.name(), null));
 
     assertThat(underTest.selectProjectAssociations(dbSession, organization, profile1, "ect2")).hasSize(1);
     assertThat(underTest.selectProjectAssociations(dbSession, organization, profile3, null)).hasSize(3);

server/sonar-server/src/main/java/org/sonar/ce/queue/CeQueueImpl.java

@@ -205,7 +205,7 @@ public class CeQueueImpl implements CeQueue {
         ComponentDto component = componentDtoByUuid.get(componentUuid);
         if (component != null) {
           builder.setOrganizationUuid(component.getOrganizationUuid());
-          builder.setComponentKey(component.getKey());
+          builder.setComponentKey(component.getDbKey());
           builder.setComponentName(component.name());
         }
       }

server/sonar-server/src/main/java/org/sonar/server/batch/IssuesAction.java

@@ -143,7 +143,7 @@ public class IssuesAction implements BatchWsAction {
     if (Scopes.PROJECT.equals(component.scope())) {
       List<ComponentDto> modulesTree = dbClient.componentDao().selectDescendantModules(session, component.uuid());
       for (ComponentDto componentDto : modulesTree) {
-        keysByUUid.put(componentDto.uuid(), componentDto.key());
+        keysByUUid.put(componentDto.uuid(), componentDto.getDbKey());
       }
     } else {
       String moduleUuid = component.moduleUuid();
@@ -151,7 +151,7 @@ public class IssuesAction implements BatchWsAction {
         throw new IllegalArgumentException(String.format("The component '%s' has no module uuid", component.uuid()));
       }
       ComponentDto module = dbClient.componentDao().selectOrFailByUuid(session, moduleUuid);
-      keysByUUid.put(module.uuid(), module.key());
+      keysByUUid.put(module.uuid(), module.getDbKey());
     }
     return keysByUUid;
   }

server/sonar-server/src/main/java/org/sonar/server/batch/ProjectDataLoader.java

@@ -33,11 +33,11 @@ import org.sonar.db.DbClient;
 import org.sonar.db.DbSession;
 import org.sonar.db.component.ComponentDto;
 import org.sonar.db.component.FilePathWithHashDto;
+import org.sonar.db.permission.OrganizationPermission;
 import org.sonar.db.property.PropertyDto;
 import org.sonar.scanner.protocol.input.FileData;
 import org.sonar.scanner.protocol.input.ProjectRepositories;
 import org.sonar.server.exceptions.ForbiddenException;
-import org.sonar.db.permission.OrganizationPermission;
 import org.sonar.server.user.UserSession;
 
 import static com.google.common.collect.Lists.newArrayList;
@@ -71,8 +71,8 @@ public class ProjectDataLoader {
       checkPermission(query.isIssuesMode(), hasScanPerm, hasBrowsePerm);
 
       ComponentDto project = getProject(module, session);
-      if (!project.key().equals(module.key())) {
-        addSettings(data, module.getKey(), getSettingsFromParents(module, hasScanPerm, session));
+      if (!project.getDbKey().equals(module.getDbKey())) {
+        addSettings(data, module.getDbKey(), getSettingsFromParents(module, hasScanPerm, session));
       }
 
       List<ComponentDto> modulesTree = dbClient.componentDao().selectEnabledDescendantModules(session, module.uuid());
@@ -121,7 +121,7 @@ public class ProjectDataLoader {
 
     Map<String, String> parentProperties = newHashMap();
     for (ComponentDto parent : parents) {
-      parentProperties.putAll(getPropertiesMap(dbClient.propertiesDao().selectProjectProperties(session, parent.key()), hasScanPerm));
+      parentProperties.putAll(getPropertiesMap(dbClient.propertiesDao().selectProjectProperties(session, parent.getDbKey()), hasScanPerm));
     }
     return parentProperties;
   }
@@ -145,8 +145,8 @@ public class ProjectDataLoader {
     addSettings(ref, moduleKey, currentParentProperties);
 
     for (ComponentDto childModule : treeModuleSettings.findChildrenModule(moduleKey)) {
-      addSettings(ref, childModule.getKey(), currentParentProperties);
-      addSettingsToChildrenModules(ref, childModule.getKey(), currentParentProperties, treeModuleSettings, hasScanPerm);
+      addSettings(ref, childModule.getDbKey(), currentParentProperties);
+      addSettingsToChildrenModules(ref, childModule.getDbKey(), currentParentProperties, treeModuleSettings, hasScanPerm);
     }
   }
 
@@ -175,7 +175,7 @@ public class ProjectDataLoader {
   private static void addFileData(ProjectRepositories data, List<ComponentDto> moduleChildren, List<FilePathWithHashDto> files) {
     Map<String, String> moduleKeysByUuid = newHashMap();
     for (ComponentDto module : moduleChildren) {
-      moduleKeysByUuid.put(module.uuid(), module.key());
+      moduleKeysByUuid.put(module.uuid(), module.getDbKey());
     }
 
     for (FilePathWithHashDto file : files) {
@@ -200,7 +200,7 @@ public class ProjectDataLoader {
   private static Map<String, String> moduleUuidsByKey(List<ComponentDto> moduleChildren) {
     Map<String, String> moduleUuidsByKey = newHashMap();
     for (ComponentDto componentDto : moduleChildren) {
-      moduleUuidsByKey.put(componentDto.key(), componentDto.uuid());
+      moduleUuidsByKey.put(componentDto.getDbKey(), componentDto.uuid());
     }
     return moduleUuidsByKey;
   }
@@ -208,7 +208,7 @@ public class ProjectDataLoader {
   private static Map<String, Long> moduleIdsByKey(List<ComponentDto> moduleChildren) {
     Map<String, Long> moduleIdsByKey = newHashMap();
     for (ComponentDto componentDto : moduleChildren) {
-      moduleIdsByKey.put(componentDto.key(), componentDto.getId());
+      moduleIdsByKey.put(componentDto.getDbKey(), componentDto.getId());
     }
     return moduleIdsByKey;
   }

server/sonar-server/src/main/java/org/sonar/server/ce/ws/TaskFormatter.java

@@ -138,7 +138,7 @@ public class TaskFormatter {
 
   private static void buildComponent(WsCe.Task.Builder builder, @Nullable ComponentDto componentDto) {
     if (componentDto != null) {
-      builder.setComponentKey(componentDto.getKey());
+      builder.setComponentKey(componentDto.getDbKey());
       builder.setComponentName(componentDto.name());
       builder.setComponentQualifier(componentDto.qualifier());
     }

server/sonar-server/src/main/java/org/sonar/server/component/ComponentFinder.java

@@ -123,7 +123,7 @@ public class ComponentFinder {
     checkRequest(component.scope().equals(Scopes.PROJECT) && rootQualifiers.contains(component.qualifier()),
       format(
         "Component '%s' (id: %s) must be a project%s.",
-        component.key(), component.uuid(),
+        component.getDbKey(), component.uuid(),
         rootQualifiers.contains(Qualifiers.VIEW) ? " or a view" : ""));
 
     return component;

server/sonar-server/src/main/java/org/sonar/server/component/ComponentUpdater.java

@@ -70,7 +70,7 @@ public class ComponentUpdater {
   public ComponentDto create(DbSession dbSession, NewComponent newComponent, @Nullable Integer userId) {
     checkKeyFormat(newComponent.qualifier(), newComponent.key());
     ComponentDto componentDto = createRootComponent(dbSession, newComponent);
-    removeDuplicatedProjects(dbSession, componentDto.getKey());
+    removeDuplicatedProjects(dbSession, componentDto.getDbKey());
     handlePermissionTemplate(dbSession, componentDto, newComponent.getOrganizationUuid(), userId);
     projectIndexers.commitAndIndex(dbSession, singletonList(componentDto), Cause.PROJECT_CREATION);
     return componentDto;
@@ -91,7 +91,7 @@ public class ComponentUpdater {
       .setModuleUuid(null)
       .setModuleUuidPath(ComponentDto.UUID_PATH_SEPARATOR + uuid + ComponentDto.UUID_PATH_SEPARATOR)
       .setProjectUuid(uuid)
-      .setKey(keyWithBranch)
+      .setDbKey(keyWithBranch)
       .setDeprecatedKey(keyWithBranch)
       .setName(newComponent.name())
       .setLongName(newComponent.name())

server/sonar-server/src/main/java/org/sonar/server/component/index/ComponentIndexer.java

@@ -185,7 +185,7 @@ public class ComponentIndexer implements ProjectIndexer, NeedAuthorizationIndexe
     return new ComponentDoc()
       .setId(component.uuid())
       .setName(component.name())
-      .setKey(component.key())
+      .setKey(component.getDbKey())
       .setProjectUuid(component.projectUuid())
       .setQualifier(component.qualifier());
   }

server/sonar-server/src/main/java/org/sonar/server/component/ws/AppAction.java

@@ -128,7 +128,7 @@ public class AppAction implements ComponentsWsAction {
       session);
     boolean isFavourite = propertyDtos.size() == 1;
 
-    json.prop("key", component.key());
+    json.prop("key", component.getDbKey());
     json.prop("uuid", component.uuid());
     json.prop("path", component.path());
     json.prop("name", component.name());
@@ -140,9 +140,9 @@ public class AppAction implements ComponentsWsAction {
 
     // Do not display parent project if parent project and project are the same
     boolean displayParentProject = parentProject != null && !parentProject.uuid().equals(project.uuid());
-    json.prop("subProject", displayParentProject ? parentProject.key() : null);
+    json.prop("subProject", displayParentProject ? parentProject.getDbKey() : null);
     json.prop("subProjectName", displayParentProject ? parentProject.longName() : null);
-    json.prop("project", project.key());
+    json.prop("project", project.getDbKey());
     json.prop("projectName", project.longName());
 
     json.prop("fav", isFavourite);

server/sonar-server/src/main/java/org/sonar/server/component/ws/ComponentDtoToWsComponent.java

@@ -58,7 +58,7 @@ class ComponentDtoToWsComponent {
     WsComponents.Component.Builder wsComponent = WsComponents.Component.newBuilder()
       .setOrganization(organizationDtoKey)
       .setId(dto.uuid())
-      .setKey(dto.key())
+      .setKey(dto.getDbKey())
       .setName(dto.name())
       .setQualifier(dto.qualifier());
     setNullable(emptyToNull(dto.path()), wsComponent::setPath);

server/sonar-server/src/main/java/org/sonar/server/component/ws/SearchAction.java

@@ -135,7 +135,7 @@ public class SearchAction implements ComponentsWsAction {
       .map(ComponentDto::projectUuid)
       .collect(toHashSet());
     List<ComponentDto> projects = dbClient.componentDao().selectByUuids(dbSession, projectUuidsToSearch);
-    return projects.stream().collect(toMap(ComponentDto::uuid, ComponentDto::key));
+    return projects.stream().collect(toMap(ComponentDto::uuid, ComponentDto::getDbKey));
   }
 
   private static ComponentQuery buildQuery(SearchWsRequest request) {
@@ -191,7 +191,7 @@ public class SearchAction implements ComponentsWsAction {
     WsComponents.Component.Builder builder = WsComponents.Component.newBuilder()
       .setOrganization(organization.getKey())
       .setId(dto.uuid())
-      .setKey(dto.key())
+      .setKey(dto.getDbKey())
       .setProject(projectKey)
       .setName(dto.name())
       .setQualifier(dto.qualifier());

server/sonar-server/src/main/java/org/sonar/server/component/ws/SearchProjectsAction.java

@@ -424,7 +424,7 @@ public class SearchProjectsAction implements ComponentsWsAction {
         .clear()
         .setOrganization(organizationDto.getKey())
         .setId(dbComponent.uuid())
-        .setKey(dbComponent.key())
+        .setKey(dbComponent.getDbKey())
         .setName(dbComponent.name())
         .setVisibility(Visibility.getLabel(dbComponent.isPrivate()));
       wsComponent.getTagsBuilder().addAllTags(dbComponent.getTags());

server/sonar-server/src/main/java/org/sonar/server/component/ws/SuggestionsAction.java

@@ -35,9 +35,9 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import javax.annotation.CheckForNull;
 import javax.annotation.Nullable;
+import org.sonar.api.resources.Qualifiers;
 import org.sonar.api.resources.ResourceType;
 import org.sonar.api.resources.ResourceTypes;
-import org.sonar.api.resources.Qualifiers;
 import org.sonar.api.server.ws.Change;
 import org.sonar.api.server.ws.Request;
 import org.sonar.api.server.ws.Response;
@@ -217,7 +217,7 @@ public class SuggestionsAction implements ComponentsWsAction {
     }
 
     List<ComponentDto> favorites = favoriteFinder.list();
-    Set<String> favoriteKeys = favorites.stream().map(ComponentDto::getKey).collect(MoreCollectors.toSet(favorites.size()));
+    Set<String> favoriteKeys = favorites.stream().map(ComponentDto::getDbKey).collect(MoreCollectors.toSet(favorites.size()));
     ComponentIndexQuery.Builder queryBuilder = ComponentIndexQuery.builder()
       .setQuery(query)
       .setRecentlyBrowsedKeys(recentlyBrowsedKeys)
@@ -343,13 +343,13 @@ public class SuggestionsAction implements ComponentsWsAction {
     checkState(organizationKey != null, "Organization with uuid '%s' not found", result.getOrganizationUuid());
     Suggestion.Builder builder = Suggestion.newBuilder()
       .setOrganization(organizationKey)
-      .setKey(result.getKey())
+      .setKey(result.getDbKey())
       .setName(result.name())
       .setMatch(hit.getHighlightedText().orElse(HtmlEscapers.htmlEscaper().escape(result.name())))
-      .setIsRecentlyBrowsed(recentlyBrowsedKeys.contains(result.getKey()))
+      .setIsRecentlyBrowsed(recentlyBrowsedKeys.contains(result.getDbKey()))
       .setIsFavorite(favoriteUuids.contains(result.uuid()));
     if (QUALIFIERS_FOR_WHICH_TO_RETURN_PROJECT.contains(result.qualifier())) {
-      builder.setProject(projectsByUuids.get(result.projectUuid()).getKey());
+      builder.setProject(projectsByUuids.get(result.projectUuid()).getDbKey());
     }
     return builder.build();
   }
@@ -366,7 +366,7 @@ public class SuggestionsAction implements ComponentsWsAction {
   private static List<Project> toProjects(Map<String, ComponentDto> projectsByUuids) {
     return projectsByUuids.values().stream()
       .map(p -> Project.newBuilder()
-        .setKey(p.key())
+        .setKey(p.getDbKey())
         .setName(p.longName())
         .build())
       .collect(Collectors.toList());

server/sonar-server/src/main/java/org/sonar/server/component/ws/TreeAction.java

@@ -65,8 +65,8 @@ import static org.sonar.db.component.ComponentTreeQuery.Strategy.LEAVES;
 import static org.sonar.server.component.ComponentFinder.ParamNames.COMPONENT_ID_AND_COMPONENT;
 import static org.sonar.server.component.ws.ComponentDtoToWsComponent.componentDtoToWsComponent;
 import static org.sonar.server.ws.KeyExamples.KEY_PROJECT_EXAMPLE_001;
-import static org.sonar.server.ws.WsParameterBuilder.QualifierParameterContext.newQualifierParameterContext;
 import static org.sonar.server.ws.WsParameterBuilder.createQualifiersParameter;
+import static org.sonar.server.ws.WsParameterBuilder.QualifierParameterContext.newQualifierParameterContext;
 import static org.sonar.server.ws.WsUtils.checkRequest;
 import static org.sonar.server.ws.WsUtils.writeProtobuf;
 import static org.sonarqube.ws.client.component.ComponentsWsParameters.ACTION_TREE;
@@ -223,7 +223,7 @@ public class TreeAction implements ComponentsWsAction {
     ComponentDto referenceComponent = referenceComponentsByUuid.get(component.getCopyResourceUuid());
     if (referenceComponent != null) {
       wsComponent.setRefId(referenceComponent.uuid());
-      wsComponent.setRefKey(referenceComponent.key());
+      wsComponent.setRefKey(referenceComponent.getDbKey());
     }
 
     return wsComponent;

server/sonar-server/src/main/java/org/sonar/server/computation/queue/ReportSubmitter.java

@@ -34,10 +34,10 @@ import org.sonar.db.DbSession;
 import org.sonar.db.ce.CeTaskTypes;
 import org.sonar.db.component.ComponentDto;
 import org.sonar.db.organization.OrganizationDto;
+import org.sonar.db.permission.OrganizationPermission;
 import org.sonar.server.component.ComponentUpdater;
 import org.sonar.server.component.NewComponent;
 import org.sonar.server.exceptions.NotFoundException;
-import org.sonar.db.permission.OrganizationPermission;
 import org.sonar.server.permission.PermissionTemplateService;
 import org.sonar.server.user.UserSession;
 
@@ -102,7 +102,7 @@ public class ReportSubmitter {
     if (project.isPresent()) {
       checkArgument(project.get().getOrganizationUuid().equals(organizationDto.getUuid()),
         "Organization of component with key '%s' does not match specified organization '%s'",
-        project.get().key(), organizationDto.getKey());
+        project.get().getDbKey(), organizationDto.getKey());
     }
   }
 

server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/UuidFactory.java

@@ -34,7 +34,7 @@ public class UuidFactory {
     try (DbSession dbSession = dbClient.openSession(false)) {
       List<ComponentDto> components = dbClient.componentDao().selectAllComponentsFromProjectKey(dbSession, rootKey);
       for (ComponentDto componentDto : components) {
-        uuidsByKey.put(componentDto.getKey(), componentDto.uuid());
+        uuidsByKey.put(componentDto.getDbKey(), componentDto.uuid());
       }
     }
   }

server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStep.java

@@ -161,7 +161,7 @@ public class FileMoveDetectionStep implements ComputationStep {
           .setStrategy(Strategy.LEAVES)
           .build());
       return from(componentDtos)
-        .transform(componentDto -> new DbComponent(componentDto.getId(), componentDto.key(), componentDto.uuid(), componentDto.path()))
+        .transform(componentDto -> new DbComponent(componentDto.getId(), componentDto.getDbKey(), componentDto.uuid(), componentDto.path()))
         .uniqueIndex(DbComponent::getKey);
     }
   }

server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistComponentsStep.java

@@ -137,7 +137,7 @@ public class PersistComponentsStep implements ComputationStep {
   private Map<String, ComponentDto> indexExistingDtosByKey(DbSession session) {
     return dbClient.componentDao().selectAllComponentsFromProjectKey(session, treeRootHolder.getRoot().getKey())
       .stream()
-      .collect(java.util.stream.Collectors.toMap(ComponentDto::key, Function.identity()));
+      .collect(java.util.stream.Collectors.toMap(ComponentDto::getDbKey, Function.identity()));
   }
 
   private class PersistComponentStepsVisitor extends PathAwareVisitorAdapter<ComponentDtoHolder> {
@@ -220,7 +220,7 @@ public class PersistComponentsStep implements ComputationStep {
     }
 
     private ComponentDto persistComponent(ComponentDto componentDto) {
-      ComponentDto existingComponent = existingComponentDtosByKey.remove(componentDto.getKey());
+      ComponentDto existingComponent = existingComponentDtosByKey.remove(componentDto.getDbKey());
       if (existingComponent == null) {
         dbClient.componentDao().insert(dbSession, componentDto);
         return componentDto;
@@ -366,7 +366,7 @@ public class PersistComponentsStep implements ComputationStep {
     ComponentDto componentDto = new ComponentDto();
     componentDto.setOrganizationUuid(analysisMetadataHolder.getOrganization().getUuid());
     componentDto.setUuid(componentUuid);
-    componentDto.setKey(componentKey);
+    componentDto.setDbKey(componentKey);
     componentDto.setDeprecatedKey(componentKey);
     componentDto.setEnabled(true);
     componentDto.setCreatedAt(new Date(system2.now()));

server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/ValidateProjectStep.java

@@ -79,7 +79,7 @@ public class ValidateProjectStep implements ComputationStep {
     try (DbSession dbSession = dbClient.openSession(false)) {
       Component root = treeRootHolder.getRoot();
       List<ComponentDto> baseModules = dbClient.componentDao().selectEnabledModulesFromProjectKey(dbSession, root.getKey());
-      Map<String, ComponentDto> baseModulesByKey = from(baseModules).uniqueIndex(ComponentDto::key);
+      Map<String, ComponentDto> baseModulesByKey = from(baseModules).uniqueIndex(ComponentDto::getDbKey);
       ValidateProjectsVisitor visitor = new ValidateProjectsVisitor(dbSession, dbClient.componentDao(), baseModulesByKey);
       new DepthTraversalTypeAwareCrawler(visitor).visit(root);
 
@@ -138,7 +138,7 @@ public class ValidateProjectStep implements ComputationStep {
         ComponentDto anotherBaseProject = componentDao.selectOrFailByUuid(session, baseProject.get().projectUuid());
         validationMessages.add(format("The project \"%s\" is already defined in SonarQube but as a module of project \"%s\". "
           + "If you really want to stop directly analysing project \"%s\", please first delete it from SonarQube and then relaunch the analysis of project \"%s\".",
-          rawProjectKey, anotherBaseProject.key(), anotherBaseProject.key(), rawProjectKey));
+          rawProjectKey, anotherBaseProject.getDbKey(), anotherBaseProject.getDbKey(), rawProjectKey));
       }
     }
 
@@ -181,7 +181,7 @@ public class ValidateProjectStep implements ComputationStep {
     private void validateModuleKeyIsNotAlreadyUsedInAnotherProject(ComponentDto baseModule, String rawModuleKey) {
       if (!baseModule.projectUuid().equals(baseModule.uuid()) && !baseModule.projectUuid().equals(rawProject.getUuid())) {
         ComponentDto projectModule = componentDao.selectOrFailByUuid(session, baseModule.projectUuid());
-        validationMessages.add(format("Module \"%s\" is already part of project \"%s\"", rawModuleKey, projectModule.key()));
+        validationMessages.add(format("Module \"%s\" is already part of project \"%s\"", rawModuleKey, projectModule.getDbKey()));
       }
     }
 

server/sonar-server/src/main/java/org/sonar/server/duplication/ws/ShowResponseBuilder.java

@@ -73,7 +73,7 @@ public class ShowResponseBuilder {
     String ref = null;
     ComponentDto componentDto = duplication.file();
     if (componentDto != null) {
-      String componentKey = componentDto.key();
+      String componentKey = componentDto.getDbKey();
       ref = refByComponentKey.get(componentKey);
       if (ref == null) {
         ref = Integer.toString(refByComponentKey.size() + 1);
@@ -91,19 +91,19 @@ public class ShowResponseBuilder {
 
   private static WsDuplications.File toWsFile(ComponentDto file, @Nullable ComponentDto project, @Nullable ComponentDto subProject) {
     WsDuplications.File.Builder wsFile = WsDuplications.File.newBuilder();
-    wsFile.setKey(file.key());
+    wsFile.setKey(file.getDbKey());
     wsFile.setUuid(file.uuid());
     wsFile.setName(file.longName());
 
     if (project != null) {
-      wsFile.setProject(project.key());
+      wsFile.setProject(project.getDbKey());
       wsFile.setProjectUuid(project.uuid());
       wsFile.setProjectName(project.longName());
 
       // Do not return sub project if sub project and project are the same
       boolean displaySubProject = subProject != null && !subProject.uuid().equals(project.uuid());
       if (displaySubProject) {
-        wsFile.setSubProject(subProject.key());
+        wsFile.setSubProject(subProject.getDbKey());
         wsFile.setSubProjectUuid(subProject.uuid());
         wsFile.setSubProjectName(subProject.longName());
       }

server/sonar-server/src/main/java/org/sonar/server/favorite/FavoriteUpdater.java

@@ -52,7 +52,7 @@ public class FavoriteUpdater {
       .setUserId(userId)
       .setComponentId(componentDto.getId())
       .build(), dbSession);
-    checkRequest(existingFavoriteOnComponent.isEmpty(), "Component '%s' is already a favorite", componentDto.getKey());
+    checkRequest(existingFavoriteOnComponent.isEmpty(), "Component '%s' is already a favorite", componentDto.getDbKey());
     dbClient.propertiesDao().saveProperty(dbSession, new PropertyDto()
       .setKey(PROP_FAVORITE_KEY)
       .setResourceId(componentDto.getId())
@@ -72,6 +72,6 @@ public class FavoriteUpdater {
       .setKey(PROP_FAVORITE_KEY)
       .setResourceId(component.getId())
       .setUserId(userId));
-    checkRequest(result == 1, "Component '%s' is not a favorite", component.key());
+    checkRequest(result == 1, "Component '%s' is not a favorite", component.getDbKey());
   }
 }

server/sonar-server/src/main/java/org/sonar/server/favorite/ws/SearchAction.java

@@ -153,7 +153,7 @@ public class SearchAction implements FavoritesWsAction {
     builder
       .clear()
       .setOrganization(organization.getKey())
-      .setKey(componentDto.key());
+      .setKey(componentDto.getDbKey());
     setNullable(componentDto.name(), builder::setName);
     setNullable(componentDto.qualifier(), builder::setQualifier);
     return builder.build();

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

@@ -80,7 +80,7 @@ public class IssueUpdater {
       .setIssue(issue)
       .setChangeAuthorLogin(context.login())
       .setRuleName(rule.map(RuleDefinitionDto::getName).orElse(null))
-      .setProject(project.getKey(), project.name())
+      .setProject(project.getDbKey(), project.name())
       .setComponent(component)
       .setComment(comment));
     return issueDto;

server/sonar-server/src/main/java/org/sonar/server/issue/notification/IssueChangeNotification.java

@@ -56,7 +56,7 @@ public class IssueChangeNotification extends Notification {
 
   public IssueChangeNotification setProject(ComponentDto project) {
     setFieldValue("projectName", project.longName());
-    setFieldValue("projectKey", project.key());
+    setFieldValue("projectKey", project.getDbKey());
     return this;
   }
 

server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchResponseFormat.java

@@ -160,13 +160,13 @@ public class SearchResponseFormat {
 
     ComponentDto component = data.getComponentByUuid(dto.getComponentUuid());
     issueBuilder.setOrganization(data.getOrganizationKey(component.getOrganizationUuid()));
-    issueBuilder.setComponent(component.key());
+    issueBuilder.setComponent(component.getDbKey());
     ComponentDto project = data.getComponentByUuid(dto.getProjectUuid());
     if (project != null) {
-      issueBuilder.setProject(project.getKey());
+      issueBuilder.setProject(project.getDbKey());
       ComponentDto subProject = data.getComponentByUuid(dto.getModuleUuid());
-      if (subProject != null && !subProject.getKey().equals(project.getKey())) {
-        issueBuilder.setSubProject(subProject.getKey());
+      if (subProject != null && !subProject.getDbKey().equals(project.getDbKey())) {
+        issueBuilder.setSubProject(subProject.getDbKey());
       }
     }
     issueBuilder.setRule(dto.getRuleKey().toString());
@@ -300,7 +300,7 @@ public class SearchResponseFormat {
       String uuid = dto.uuid();
       Component.Builder builder = Component.newBuilder()
         .setOrganization(data.getOrganizationKey(dto.getOrganizationUuid()))
-        .setKey(dto.key())
+        .setKey(dto.getDbKey())
         .setUuid(uuid)
         .setQualifier(dto.qualifier())
         .setName(nullToEmpty(dto.name()))

server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/CreateAction.java

@@ -134,14 +134,14 @@ public class CreateAction implements CustomMeasuresWsAction {
   }
 
   private static void checkIsProjectOrModule(ComponentDto component) {
-    checkRequest(Scopes.PROJECT.equals(component.scope()), "Component '%s' (id: %s) must be a project or a module.", component.key(), component.uuid());
+    checkRequest(Scopes.PROJECT.equals(component.scope()), "Component '%s' (id: %s) must be a project or a module.", component.getDbKey(), component.uuid());
   }
 
   private void checkMeasureDoesNotExistAlready(DbSession dbSession, ComponentDto component, MetricDto metric) {
     int nbMeasuresOnSameMetricAndMeasure = dbClient.customMeasureDao().countByComponentIdAndMetricId(dbSession, component.uuid(), metric.getId());
     checkRequest(nbMeasuresOnSameMetricAndMeasure == 0,
       "A measure already exists for project '%s' (id: %s) and metric '%s' (id: '%d')",
-      component.key(), component.uuid(), metric.getKey(), metric.getId());
+      component.getDbKey(), component.uuid(), metric.getKey(), metric.getId());
   }
 
   private MetricDto searchMetric(DbSession dbSession, Request request) {

server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/CustomMeasureJsonWriter.java

@@ -69,7 +69,7 @@ public class CustomMeasureJsonWriter {
       MetricJsonWriter.write(json, metric, MetricJsonWriter.MANDATORY_FIELDS);
     }
     writeIfNeeded(json, component.uuid(), FIELD_PROJECT_ID, fieldsToReturn);
-    writeIfNeeded(json, component.key(), FIELD_PROJECT_KEY, fieldsToReturn);
+    writeIfNeeded(json, component.getDbKey(), FIELD_PROJECT_KEY, fieldsToReturn);
     writeIfNeeded(json, new Date(measure.getCreatedAt()), FIELD_CREATED_AT, fieldsToReturn);
     writeIfNeeded(json, new Date(measure.getUpdatedAt()), FIELD_UPDATED_AT, fieldsToReturn);
     writeIfNeeded(json, isPending, FIELD_PENDING, fieldsToReturn);

server/sonar-server/src/main/java/org/sonar/server/measure/ws/ComponentDtoToWsComponent.java

@@ -38,7 +38,7 @@ class ComponentDtoToWsComponent {
     ComponentDto referenceComponent = referenceComponentsByUuid.get(component.getCopyResourceUuid());
     if (referenceComponent != null) {
       wsComponent.setRefId(referenceComponent.uuid());
-      wsComponent.setRefKey(referenceComponent.key());
+      wsComponent.setRefKey(referenceComponent.getDbKey());
     }
 
     WsMeasures.Measure.Builder measureBuilder = WsMeasures.Measure.newBuilder();
@@ -54,7 +54,7 @@ class ComponentDtoToWsComponent {
   static Component.Builder componentDtoToWsComponent(ComponentDto component) {
     Component.Builder wsComponent = Component.newBuilder()
       .setId(component.uuid())
-      .setKey(component.key())
+      .setKey(component.getDbKey())
       .setName(component.name())
       .setQualifier(component.qualifier());
     if (component.path() != null) {

server/sonar-server/src/main/java/org/sonar/server/measure/ws/ComponentTreeAction.java

@@ -317,7 +317,7 @@ public class ComponentTreeAction implements MeasuresWsAction {
     ComponentDto referenceComponent = referenceComponentsByUuid.get(component.getCopyResourceUuid());
     if (referenceComponent != null) {
       wsComponent.setRefId(referenceComponent.uuid());
-      wsComponent.setRefKey(referenceComponent.key());
+      wsComponent.setRefKey(referenceComponent.getDbKey());
     }
     WsMeasures.Measure.Builder measureBuilder = WsMeasures.Measure.newBuilder();
     for (Map.Entry<MetricDto, ComponentTreeData.Measure> entry : measures.entrySet()) {

server/sonar-server/src/main/java/org/sonar/server/measure/ws/SearchAction.java

@@ -176,7 +176,7 @@ public class SearchAction implements MeasuresWsAction {
 
     private List<Measure> buildWsMeasures() {
       Map<String, ComponentDto> componentsByUuid = projects.stream().collect(toMap(ComponentDto::uuid, Function.identity()));
-      Map<String, String> componentNamesByKey = projects.stream().collect(toMap(ComponentDto::key, ComponentDto::name));
+      Map<String, String> componentNamesByKey = projects.stream().collect(toMap(ComponentDto::getDbKey, ComponentDto::name));
       Map<Integer, MetricDto> metricsById = metrics.stream().collect(toMap(MetricDto::getId, identity()));
 
       Function<MeasureDto, MetricDto> dbMeasureToDbMetric = dbMeasure -> metricsById.get(dbMeasure.getMetricId());
@@ -187,7 +187,7 @@ public class SearchAction implements MeasuresWsAction {
       return measures.stream()
         .map(dbMeasure -> {
           updateMeasureBuilder(measureBuilder, dbMeasureToDbMetric.apply(dbMeasure), dbMeasure);
-          measureBuilder.setComponent(componentsByUuid.get(dbMeasure.getComponentUuid()).getKey());
+          measureBuilder.setComponent(componentsByUuid.get(dbMeasure.getComponentUuid()).getDbKey());
           Measure measure = measureBuilder.build();
           measureBuilder.clear();
           return measure;

server/sonar-server/src/main/java/org/sonar/server/notification/ws/ListAction.java

@@ -204,7 +204,7 @@ public class ListAction implements NotificationsWsAction {
     checkArgument(organizationDto != null, "No organization for uuid '%s'", organizationUuid);
 
     return notification.setOrganization(organizationDto.getKey())
-      .setProject(project.getKey())
+      .setProject(project.getDbKey())
       .setProjectName(project.name());
   }
 

server/sonar-server/src/main/java/org/sonar/server/permission/PermissionTemplateService.java

@@ -80,7 +80,7 @@ public class PermissionTemplateService {
     }
 
     String effectiveKey = ComponentKeys.createKey(projectKey, branch);
-    ComponentDto dto = new ComponentDto().setOrganizationUuid(organizationUuid).setKey(effectiveKey).setQualifier(qualifier);
+    ComponentDto dto = new ComponentDto().setOrganizationUuid(organizationUuid).setDbKey(effectiveKey).setQualifier(qualifier);
     PermissionTemplateDto template = findTemplate(dbSession, organizationUuid, dto);
     if (template == null) {
       return false;
@@ -190,11 +190,11 @@ public class PermissionTemplateService {
     List<PermissionTemplateDto> matchingTemplates = new ArrayList<>();
     for (PermissionTemplateDto permissionTemplateDto : allPermissionTemplates) {
       String keyPattern = permissionTemplateDto.getKeyPattern();
-      if (StringUtils.isNotBlank(keyPattern) && component.getKey().matches(keyPattern)) {
+      if (StringUtils.isNotBlank(keyPattern) && component.getDbKey().matches(keyPattern)) {
         matchingTemplates.add(permissionTemplateDto);
       }
     }
-    checkAtMostOneMatchForComponentKey(component.getKey(), matchingTemplates);
+    checkAtMostOneMatchForComponentKey(component.getDbKey(), matchingTemplates);
     if (matchingTemplates.size() == 1) {
       return matchingTemplates.get(0);
     }

server/sonar-server/src/main/java/org/sonar/server/permission/ws/SearchProjectPermissionsAction.java

@@ -142,7 +142,7 @@ public class SearchProjectPermissionsAction implements PermissionsWsAction {
       rootComponentBuilder
         .clear()
         .setId(rootComponent.uuid())
-        .setKey(rootComponent.key())
+        .setKey(rootComponent.getDbKey())
         .setQualifier(rootComponent.qualifier())
         .setName(rootComponent.name());
       for (String permission : data.permissions(rootComponent.getId())) {

server/sonar-server/src/main/java/org/sonar/server/project/ws/CreateAction.java

@@ -147,7 +147,7 @@ public class CreateAction implements ProjectsWsAction {
   private static CreateWsResponse toCreateResponse(ComponentDto componentDto) {
     return CreateWsResponse.newBuilder()
       .setProject(CreateWsResponse.Project.newBuilder()
-        .setKey(componentDto.key())
+        .setKey(componentDto.getDbKey())
         .setName(componentDto.name())
         .setQualifier(componentDto.qualifier())
         .setVisibility(Visibility.getLabel(componentDto.isPrivate())))

server/sonar-server/src/main/java/org/sonar/server/project/ws/GhostsAction.java

@@ -123,7 +123,7 @@ public class GhostsAction implements ProjectsWsAction {
     for (ComponentDto project : projects) {
       json.beginObject();
       json.prop("uuid", project.uuid());
-      writeIfWished(json, "key", project.key(), fieldsToReturn);
+      writeIfWished(json, "key", project.getDbKey(), fieldsToReturn);
       writeIfWished(json, "name", project.name(), fieldsToReturn);
       writeIfWished(json, "creationDate", project.getCreatedAt(), fieldsToReturn);
       writeIfWished(json, "visibility", project.isPrivate() ? PRIVATE.getLabel() : PUBLIC.getLabel(), fieldsToReturn);

server/sonar-server/src/main/java/org/sonar/server/project/ws/IndexAction.java

@@ -134,7 +134,7 @@ public class IndexAction implements ProjectsWsAction {
   private static void addProject(JsonWriter json, ComponentDto project) {
     json.beginObject()
       .prop("id", project.getId())
-      .prop("k", project.getKey())
+      .prop("k", project.getDbKey())
       .prop("nm", project.name())
       .prop("sc", project.scope())
       .prop("qu", project.qualifier())

server/sonar-server/src/main/java/org/sonar/server/project/ws/ProvisionedAction.java

@@ -124,7 +124,7 @@ public class ProvisionedAction implements ProjectsWsAction {
   private static List<Component> writeProjects(List<ComponentDto> projects, Set<String> desiredFields) {
     return projects.stream().map(project -> {
       Component.Builder compBuilder = Component.newBuilder().setUuid(project.uuid());
-      writeIfNeeded("key", project.key(), compBuilder::setKey, desiredFields);
+      writeIfNeeded("key", project.getDbKey(), compBuilder::setKey, desiredFields);
       writeIfNeeded("name", project.name(), compBuilder::setName, desiredFields);
       writeIfNeeded("creationDate", project.getCreatedAt(), compBuilder::setCreationDate, desiredFields);
       writeIfNeeded("visibility", project.isPrivate() ? PRIVATE.getLabel() : PUBLIC.getLabel(), compBuilder::setVisibility, desiredFields);

server/sonar-server/src/main/java/org/sonar/server/project/ws/SearchAction.java

@@ -169,7 +169,7 @@ public class SearchAction implements ProjectsWsAction {
     Component.Builder builder = Component.newBuilder()
       .setOrganization(organization.getKey())
       .setId(dto.uuid())
-      .setKey(dto.key())
+      .setKey(dto.getDbKey())
       .setName(dto.name())
       .setQualifier(dto.qualifier())
       .setVisibility(dto.isPrivate() ? PRIVATE.getLabel() : PUBLIC.getLabel());

server/sonar-server/src/main/java/org/sonar/server/project/ws/SearchMyProjectsAction.java

@@ -121,7 +121,7 @@ public class SearchMyProjectsAction implements ProjectsWsAction {
       Project.Builder project = Project.newBuilder();
       project
         .setId(dto.uuid())
-        .setKey(dto.key())
+        .setKey(dto.getDbKey())
         .setName(dto.name());
       data.lastAnalysisDateFor(dto.uuid()).ifPresent(project::setLastAnalysisDate);
       data.qualityGateStatusFor(dto.uuid()).ifPresent(project::setQualityGate);

server/sonar-server/src/main/java/org/sonar/server/projecttag/ws/SetAction.java

@@ -94,7 +94,7 @@ public class SetAction implements ProjectTagsWsAction {
 
     try (DbSession dbSession = dbClient.openSession(false)) {
       ComponentDto project = componentFinder.getByKey(dbSession, projectKey);
-      checkRequest(PROJECT.equals(project.qualifier()), "Component '%s' is not a project", project.key());
+      checkRequest(PROJECT.equals(project.qualifier()), "Component '%s' is not a project", project.getDbKey());
       userSession.checkComponentPermission(UserRole.ADMIN, project);
 
       project.setTags(tags);

server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/SearchAction.java

@@ -175,7 +175,7 @@ public class SearchAction implements QProfileWsAction {
 
     ComponentDto project = componentFinder.getByKey(dbSession, request.getProjectKey());
     if (!project.getOrganizationUuid().equals(organization.getUuid())) {
-      throw new NotFoundException(format("Component key '%s' not found", project.getKey()));
+      throw new NotFoundException(format("Component key '%s' not found", project.getDbKey()));
     }
     if (project.isRoot()) {
       return project;

server/sonar-server/src/main/java/org/sonar/server/source/ws/LinesAction.java

@@ -119,7 +119,7 @@ public class LinesAction implements SourcesWsAction {
       int from = request.mandatoryParamAsInt(PARAM_FROM);
       int to = MoreObjects.firstNonNull(request.paramAsInt(PARAM_TO), Integer.MAX_VALUE);
 
-      Iterable<DbFileSources.Line> lines = checkFoundWithOptional(sourceService.getLines(dbSession, file.uuid(), from, to), "No source found for file '%s'", file.key());
+      Iterable<DbFileSources.Line> lines = checkFoundWithOptional(sourceService.getLines(dbSession, file.uuid(), from, to), "No source found for file '%s'", file.getDbKey());
       try (JsonWriter json = response.newJsonWriter()) {
         json.beginObject();
         writeSource(lines, json);

server/sonar-server/src/main/java/org/sonar/server/startup/DisplayLogOnDeprecatedProjects.java

@@ -66,7 +66,7 @@ public class DisplayLogOnDeprecatedProjects implements Startable {
           LOG.warn("We detected that the following projects have not been analysed on a SonarQube version greater than 4.2 (included):");
           hasDetectDeprecatedProjects = true;
         }
-        LOG.warn(" - {}", project.getKey());
+        LOG.warn(" - {}", project.getDbKey());
       }
     }
     if (hasDetectDeprecatedProjects) {

server/sonar-server/src/main/java/org/sonar/server/test/ws/CoveredFilesAction.java

@@ -91,7 +91,7 @@ public class CoveredFilesAction implements TestsWsAction {
         fileBuilder.setCoveredLines(doc.coveredLines().size());
         ComponentDto component = componentsByUuid.get(doc.fileUuid());
         if (component != null) {
-          fileBuilder.setKey(component.key());
+          fileBuilder.setKey(component.getDbKey());
           fileBuilder.setLongName(component.longName());
         }
 

server/sonar-server/src/main/java/org/sonar/server/test/ws/ListAction.java

@@ -158,7 +158,7 @@ public class ListAction implements TestsWsAction {
       testBuilder.setFileId(testDoc.fileUuid());
       ComponentDto component = componentsByTestFileUuid.get(testDoc.fileUuid());
       if (component != null) {
-        testBuilder.setFileKey(component.getKey());
+        testBuilder.setFileKey(component.getDbKey());
         testBuilder.setFileName(component.longName());
       }
       testBuilder.setStatus(WsTests.TestStatus.valueOf(testDoc.status()));

server/sonar-server/src/main/java/org/sonar/server/ui/ws/ComponentAction.java

@@ -169,7 +169,7 @@ public class ComponentAction implements NavigationWsAction {
   }
 
   private void writeComponent(JsonWriter json, DbSession session, ComponentDto component, OrganizationDto organizationDto, @Nullable SnapshotDto analysis) {
-    json.prop("key", component.key())
+    json.prop("key", component.getDbKey())
       .prop("organization", organizationDto.getKey())
       .prop("id", component.uuid())
       .prop("name", component.name())
@@ -281,7 +281,7 @@ public class ComponentAction implements NavigationWsAction {
 
     for (ComponentDto c : breadcrumb) {
       json.beginObject()
-        .prop("key", c.key())
+        .prop("key", c.getDbKey())
         .prop("name", c.name())
         .prop("qualifier", c.qualifier())
         .endObject();

server/sonar-server/src/main/java/org/sonar/server/webhook/ws/WebhookWsSupport.java

@@ -40,7 +40,7 @@ class WebhookWsSupport {
       .setUrl(dto.getUrl())
       .setSuccess(dto.isSuccess())
       .setCeTaskId(dto.getCeTaskUuid())
-      .setComponentKey(component.getKey());
+      .setComponentKey(component.getDbKey());
     if (dto.getHttpStatus() != null) {
       builder.setHttpStatus(dto.getHttpStatus());
     }

server/sonar-server/src/test/java/org/sonar/ce/queue/CeQueueImplTest.java

@@ -195,7 +195,7 @@ public class CeQueueImplTest {
       assertThat(task.getComponentKey()).isNull();
       assertThat(task.getComponentName()).isNull();
     } else {
-      assertThat(task.getComponentKey()).isEqualTo(componentDto.key());
+      assertThat(task.getComponentKey()).isEqualTo(componentDto.getDbKey());
       assertThat(task.getComponentName()).isEqualTo(componentDto.name());
     }
     assertThat(task.getSubmitterLogin()).isEqualTo(taskSubmit.getSubmitterLogin());

server/sonar-server/src/test/java/org/sonar/server/batch/IssuesActionTest.java

@@ -81,10 +81,10 @@ public class IssuesActionTest {
         .setAssignee(null));
     addPermissionTo(project);
 
-    ServerIssue serverIssue = call(project.key());
+    ServerIssue serverIssue = call(project.getDbKey());
 
     assertThat(serverIssue.getKey()).isEqualTo(issue.getKey());
-    assertThat(serverIssue.getModuleKey()).isEqualTo(module.getKey());
+    assertThat(serverIssue.getModuleKey()).isEqualTo(module.getDbKey());
     assertThat(serverIssue.getRuleRepository()).isEqualTo(rule.getRepositoryKey());
     assertThat(serverIssue.getRuleKey()).isEqualTo(rule.getRuleKey());
     assertThat(serverIssue.getStatus()).isEqualTo("OPEN");
@@ -118,10 +118,10 @@ public class IssuesActionTest {
         .setAssignee("foo"));
     addPermissionTo(project);
 
-    ServerIssue serverIssue = call(project.key());
+    ServerIssue serverIssue = call(project.getDbKey());
 
     assertThat(serverIssue.getKey()).isEqualTo(issue.getKey());
-    assertThat(serverIssue.getModuleKey()).isEqualTo(module.getKey());
+    assertThat(serverIssue.getModuleKey()).isEqualTo(module.getDbKey());
     assertThat(serverIssue.getRuleRepository()).isEqualTo(rule.getRepositoryKey());
     assertThat(serverIssue.getRuleKey()).isEqualTo(rule.getRuleKey());
     assertThat(serverIssue.getStatus()).isEqualTo("OPEN");
@@ -147,13 +147,13 @@ public class IssuesActionTest {
     IssueDto issueOnProject = db.issues().insert(rule, project, project, i -> i.setKee("ON_PROJECT"));
 
     addPermissionTo(project);
-    try (CloseableIterator<ServerIssue> result = callStream(project.key())) {
+    try (CloseableIterator<ServerIssue> result = callStream(project.getDbKey())) {
       assertThat(result)
         .extracting(ServerIssue::getKey, ServerIssue::getModuleKey)
         .containsExactlyInAnyOrder(
-          tuple(issueOnFile.getKey(), module.key()),
-          tuple(issueOnModule.getKey(), module.key()),
-          tuple(issueOnProject.getKey(), project.key()));
+          tuple(issueOnFile.getKey(), module.getDbKey()),
+          tuple(issueOnModule.getKey(), module.getDbKey()),
+          tuple(issueOnProject.getKey(), project.getDbKey()));
     }
   }
 
@@ -168,12 +168,12 @@ public class IssuesActionTest {
     IssueDto issueOnProject = db.issues().insert(rule, project, project, i -> i.setKee("ON_PROJECT"));
 
     addPermissionTo(project);
-    try (CloseableIterator<ServerIssue> result = callStream(module.key())) {
+    try (CloseableIterator<ServerIssue> result = callStream(module.getDbKey())) {
       assertThat(result)
         .extracting(ServerIssue::getKey, ServerIssue::getModuleKey)
         .containsExactlyInAnyOrder(
-          tuple(issueOnFile.getKey(), module.key()),
-          tuple(issueOnModule.getKey(), module.key()));
+          tuple(issueOnFile.getKey(), module.getDbKey()),
+          tuple(issueOnModule.getKey(), module.getDbKey()));
     }
   }
 
@@ -188,11 +188,11 @@ public class IssuesActionTest {
     IssueDto issueOnProject = db.issues().insert(rule, project, project);
 
     addPermissionTo(project);
-    try (CloseableIterator<ServerIssue> result = callStream(file.key())) {
+    try (CloseableIterator<ServerIssue> result = callStream(file.getDbKey())) {
       assertThat(result)
         .extracting(ServerIssue::getKey, ServerIssue::getModuleKey)
         .containsExactlyInAnyOrder(
-          tuple(issueOnFile.getKey(), module.key()));
+          tuple(issueOnFile.getKey(), module.getDbKey()));
     }
   }
 
@@ -205,7 +205,7 @@ public class IssuesActionTest {
     expectedException.expect(IllegalArgumentException.class);
     expectedException.expectMessage("Component of scope 'DIR' is not allowed");
 
-    call(directory.key());
+    call(directory.getDbKey());
   }
 
   @Test
@@ -217,11 +217,11 @@ public class IssuesActionTest {
     IssueDto issue = db.issues().insert(rule, project, file);
 
     addPermissionTo(project);
-    try (CloseableIterator<ServerIssue> result = callStream(project.key())) {
+    try (CloseableIterator<ServerIssue> result = callStream(project.getDbKey())) {
       // Module key of removed file should be returned
       assertThat(result)
         .extracting(ServerIssue::getKey, ServerIssue::getModuleKey)
-        .containsExactly(tuple(issue.getKey(), module.key()));
+        .containsExactly(tuple(issue.getKey(), module.getDbKey()));
     }
   }
 
@@ -232,7 +232,7 @@ public class IssuesActionTest {
 
     expectedException.expect(ForbiddenException.class);
 
-    tester.newRequest().setParam("key", file.key()).execute();
+    tester.newRequest().setParam("key", file.getDbKey()).execute();
   }
 
   @Test

server/sonar-server/src/test/java/org/sonar/server/batch/ProjectDataLoaderMediumTest.java

@@ -100,9 +100,9 @@ public class ProjectDataLoaderMediumTest {
       dbSession, new PropertyDto().setKey("sonar.jira.login.secured").setValue("john").setResourceId(project.getId()));
     dbSession.commit();
 
-    ProjectRepositories ref = underTest.load(ProjectDataQuery.create().setModuleKey(project.key()));
+    ProjectRepositories ref = underTest.load(ProjectDataQuery.create().setModuleKey(project.getDbKey()));
 
-    Map<String, String> projectSettings = ref.settings(project.key());
+    Map<String, String> projectSettings = ref.settings(project.getDbKey());
     assertThat(projectSettings).isEqualTo(ImmutableMap.of(
       "sonar.jira.project.key", "SONAR",
       "sonar.jira.login.secured", "john"));
@@ -124,9 +124,9 @@ public class ProjectDataLoaderMediumTest {
       dbSession, new PropertyDto().setKey("sonar.jira.login.secured").setValue("john").setResourceId(project.getId()));
     dbSession.commit();
 
-    ProjectRepositories ref = underTest.load(ProjectDataQuery.create().setModuleKey(project.key()));
+    ProjectRepositories ref = underTest.load(ProjectDataQuery.create().setModuleKey(project.getDbKey()));
 
-    Map<String, String> projectSettings = ref.settings(project.key());
+    Map<String, String> projectSettings = ref.settings(project.getDbKey());
     assertThat(projectSettings).isEqualTo(ImmutableMap.of(
       "sonar.jira.project.key", "SONAR",
       "sonar.jira.login.secured", "john"));
@@ -148,8 +148,8 @@ public class ProjectDataLoaderMediumTest {
       dbSession, new PropertyDto().setKey("sonar.jira.login.secured").setValue("john").setResourceId(project.getId()));
     dbSession.commit();
 
-    ProjectRepositories ref = underTest.load(ProjectDataQuery.create().setModuleKey(project.key()).setIssuesMode(true));
-    Map<String, String> projectSettings = ref.settings(project.key());
+    ProjectRepositories ref = underTest.load(ProjectDataQuery.create().setModuleKey(project.getDbKey()).setIssuesMode(true));
+    Map<String, String> projectSettings = ref.settings(project.getDbKey());
     assertThat(projectSettings).isEqualTo(ImmutableMap.of(
       "sonar.jira.project.key", "SONAR"));
   }
@@ -180,11 +180,11 @@ public class ProjectDataLoaderMediumTest {
 
     dbSession.commit();
 
-    ProjectRepositories ref = underTest.load(ProjectDataQuery.create().setModuleKey(project.key()));
-    assertThat(ref.settings(project.key())).isEqualTo(ImmutableMap.of(
+    ProjectRepositories ref = underTest.load(ProjectDataQuery.create().setModuleKey(project.getDbKey()));
+    assertThat(ref.settings(project.getDbKey())).isEqualTo(ImmutableMap.of(
       "sonar.jira.project.key", "SONAR",
       "sonar.jira.login.secured", "john"));
-    assertThat(ref.settings(module.key())).isEqualTo(ImmutableMap.of(
+    assertThat(ref.settings(module.getDbKey())).isEqualTo(ImmutableMap.of(
       "sonar.jira.project.key", "SONAR-SERVER",
       "sonar.jira.login.secured", "john",
       "sonar.coverage.exclusions", "**/*.java"));
@@ -212,11 +212,11 @@ public class ProjectDataLoaderMediumTest {
 
     dbSession.commit();
 
-    ProjectRepositories ref = underTest.load(ProjectDataQuery.create().setModuleKey(project.key()));
-    assertThat(ref.settings(project.key())).isEqualTo(ImmutableMap.of(
+    ProjectRepositories ref = underTest.load(ProjectDataQuery.create().setModuleKey(project.getDbKey()));
+    assertThat(ref.settings(project.getDbKey())).isEqualTo(ImmutableMap.of(
       "sonar.jira.project.key", "SONAR",
       "sonar.jira.login.secured", "john"));
-    assertThat(ref.settings(module.key())).isEqualTo(ImmutableMap.of(
+    assertThat(ref.settings(module.getDbKey())).isEqualTo(ImmutableMap.of(
       "sonar.jira.project.key", "SONAR",
       "sonar.jira.login.secured", "john"));
   }
@@ -254,15 +254,15 @@ public class ProjectDataLoaderMediumTest {
 
     dbSession.commit();
 
-    ProjectRepositories ref = underTest.load(ProjectDataQuery.create().setModuleKey(project.key()));
-    assertThat(ref.settings(project.key())).isEqualTo(ImmutableMap.of(
+    ProjectRepositories ref = underTest.load(ProjectDataQuery.create().setModuleKey(project.getDbKey()));
+    assertThat(ref.settings(project.getDbKey())).isEqualTo(ImmutableMap.of(
       "sonar.jira.project.key", "SONAR",
       "sonar.jira.login.secured", "john"));
-    assertThat(ref.settings(module.key())).isEqualTo(ImmutableMap.of(
+    assertThat(ref.settings(module.getDbKey())).isEqualTo(ImmutableMap.of(
       "sonar.jira.project.key", "SONAR-SERVER",
       "sonar.jira.login.secured", "john",
       "sonar.coverage.exclusions", "**/*.java"));
-    assertThat(ref.settings(subModule.key())).isEqualTo(ImmutableMap.of(
+    assertThat(ref.settings(subModule.getDbKey())).isEqualTo(ImmutableMap.of(
       "sonar.jira.project.key", "SONAR-SERVER-DAO",
       "sonar.jira.login.secured", "john",
       "sonar.coverage.exclusions", "**/*.java"));
@@ -300,15 +300,15 @@ public class ProjectDataLoaderMediumTest {
 
     dbSession.commit();
 
-    ProjectRepositories ref = underTest.load(ProjectDataQuery.create().setModuleKey(project.key()));
-    assertThat(ref.settings(project.key())).isEqualTo(ImmutableMap.of(
+    ProjectRepositories ref = underTest.load(ProjectDataQuery.create().setModuleKey(project.getDbKey()));
+    assertThat(ref.settings(project.getDbKey())).isEqualTo(ImmutableMap.of(
       "sonar.jira.project.key", "SONAR",
       "sonar.jira.login.secured", "john"));
-    assertThat(ref.settings(module1.key())).isEqualTo(ImmutableMap.of(
+    assertThat(ref.settings(module1.getDbKey())).isEqualTo(ImmutableMap.of(
       "sonar.jira.project.key", "SONAR-SERVER",
       "sonar.jira.login.secured", "john",
       "sonar.coverage.exclusions", "**/*.java"));
-    assertThat(ref.settings(module2.key())).isEqualTo(ImmutableMap.of(
+    assertThat(ref.settings(module2.getDbKey())).isEqualTo(ImmutableMap.of(
       "sonar.jira.project.key", "SONAR-APPLICATION",
       "sonar.jira.login.secured", "john"));
   }
@@ -329,8 +329,8 @@ public class ProjectDataLoaderMediumTest {
 
     dbSession.commit();
 
-    ProjectRepositories ref = underTest.load(ProjectDataQuery.create().setModuleKey(project.key()));
-    assertThat(ref.settings(project.key())).isEqualTo(ImmutableMap.of(
+    ProjectRepositories ref = underTest.load(ProjectDataQuery.create().setModuleKey(project.getDbKey()));
+    assertThat(ref.settings(project.getDbKey())).isEqualTo(ImmutableMap.of(
       "sonar.jira.project.key", "SONAR",
       "sonar.jira.login.secured", "john"));
   }
@@ -360,10 +360,10 @@ public class ProjectDataLoaderMediumTest {
 
     dbSession.commit();
 
-    ProjectRepositories ref = underTest.load(ProjectDataQuery.create().setModuleKey(subModule.key()));
-    assertThat(ref.settings(project.key())).isEmpty();
-    assertThat(ref.settings(module.key())).isEmpty();
-    assertThat(ref.settings(subModule.key())).isEqualTo(ImmutableMap.of(
+    ProjectRepositories ref = underTest.load(ProjectDataQuery.create().setModuleKey(subModule.getDbKey()));
+    assertThat(ref.settings(project.getDbKey())).isEmpty();
+    assertThat(ref.settings(module.getDbKey())).isEmpty();
+    assertThat(ref.settings(subModule.getDbKey())).isEqualTo(ImmutableMap.of(
       "sonar.jira.project.key", "SONAR",
       "sonar.jira.login.secured", "john",
       "sonar.coverage.exclusions", "**/*.java"));
@@ -396,10 +396,10 @@ public class ProjectDataLoaderMediumTest {
 
     dbSession.commit();
 
-    ProjectRepositories ref = underTest.load(ProjectDataQuery.create().setModuleKey(subModule.key()));
-    assertThat(ref.settings(project.key())).isEmpty();
-    assertThat(ref.settings(module.key())).isEmpty();
-    assertThat(ref.settings(subModule.key())).isEqualTo(ImmutableMap.of(
+    ProjectRepositories ref = underTest.load(ProjectDataQuery.create().setModuleKey(subModule.getDbKey()));
+    assertThat(ref.settings(project.getDbKey())).isEmpty();
+    assertThat(ref.settings(module.getDbKey())).isEmpty();
+    assertThat(ref.settings(subModule.getDbKey())).isEqualTo(ImmutableMap.of(
       "sonar.jira.project.key", "SONAR",
       "sonar.jira.login.secured", "john",
       "sonar.coverage.exclusions", "**/*.java"));
@@ -430,10 +430,10 @@ public class ProjectDataLoaderMediumTest {
 
     dbSession.commit();
 
-    ProjectRepositories ref = underTest.load(ProjectDataQuery.create().setModuleKey(subModule.key()));
-    assertThat(ref.settings(project.key())).isEmpty();
-    assertThat(ref.settings(module.key())).isEmpty();
-    assertThat(ref.settings(subModule.key())).isEqualTo(ImmutableMap.of(
+    ProjectRepositories ref = underTest.load(ProjectDataQuery.create().setModuleKey(subModule.getDbKey()));
+    assertThat(ref.settings(project.getDbKey())).isEmpty();
+    assertThat(ref.settings(module.getDbKey())).isEmpty();
+    assertThat(ref.settings(subModule.getDbKey())).isEqualTo(ImmutableMap.of(
       "sonar.jira.project.key", "SONAR",
       "sonar.jira.login.secured", "john",
       "sonar.coverage.exclusions", "**/*.java"));
@@ -465,10 +465,10 @@ public class ProjectDataLoaderMediumTest {
 
     dbSession.commit();
 
-    ProjectRepositories ref = underTest.load(ProjectDataQuery.create().setModuleKey(subModule.key()));
-    assertThat(ref.settings(project.key())).isEmpty();
-    assertThat(ref.settings(module.key())).isEmpty();
-    assertThat(ref.settings(subModule.key())).isEqualTo(ImmutableMap.of(
+    ProjectRepositories ref = underTest.load(ProjectDataQuery.create().setModuleKey(subModule.getDbKey()));
+    assertThat(ref.settings(project.getDbKey())).isEmpty();
+    assertThat(ref.settings(module.getDbKey())).isEmpty();
+    assertThat(ref.settings(subModule.getDbKey())).isEqualTo(ImmutableMap.of(
       "sonar.jira.project.key", "SONAR-SERVER",
       "sonar.jira.login.secured", "john",
       "sonar.coverage.exclusions", "**/*.java"));
@@ -485,7 +485,7 @@ public class ProjectDataLoaderMediumTest {
     dbSession.commit();
 
     try {
-      underTest.load(ProjectDataQuery.create().setModuleKey(project.key()));
+      underTest.load(ProjectDataQuery.create().setModuleKey(project.getDbKey()));
       fail();
     } catch (Exception e) {
       assertThat(e).isInstanceOf(ForbiddenException.class).hasMessage(Messages.NO_PERMISSION);
@@ -505,7 +505,7 @@ public class ProjectDataLoaderMediumTest {
     thrown.expect(ForbiddenException.class);
     thrown.expectMessage("You're only authorized to execute a local (preview) SonarQube analysis without pushing the results to the SonarQube server. " +
       "Please contact your SonarQube administrator.");
-    underTest.load(ProjectDataQuery.create().setModuleKey(project.key()).setIssuesMode(false));
+    underTest.load(ProjectDataQuery.create().setModuleKey(project.getDbKey()).setIssuesMode(false));
   }
 
   @Test
@@ -520,7 +520,7 @@ public class ProjectDataLoaderMediumTest {
 
     thrown.expect(ForbiddenException.class);
     thrown.expectMessage("You don't have the required permissions to access this project. Please contact your SonarQube administrator.");
-    underTest.load(ProjectDataQuery.create().setModuleKey(project.key()).setIssuesMode(true));
+    underTest.load(ProjectDataQuery.create().setModuleKey(project.getDbKey()).setIssuesMode(true));
   }
 
   @Test
@@ -537,9 +537,9 @@ public class ProjectDataLoaderMediumTest {
     tester.get(FileSourceDao.class).insert(dbSession, newFileSourceDto(file).setSrcHash("123456"));
     dbSession.commit();
 
-    ProjectRepositories ref = underTest.load(ProjectDataQuery.create().setModuleKey(project.key()));
-    assertThat(ref.fileDataByPath(project.key())).hasSize(1);
-    FileData fileData = ref.fileData(project.key(), file.path());
+    ProjectRepositories ref = underTest.load(ProjectDataQuery.create().setModuleKey(project.getDbKey()));
+    assertThat(ref.fileDataByPath(project.getDbKey())).hasSize(1);
+    FileData fileData = ref.fileData(project.getDbKey(), file.path());
     assertThat(fileData.hash()).isEqualTo("123456");
   }
 
@@ -567,9 +567,9 @@ public class ProjectDataLoaderMediumTest {
 
     dbSession.commit();
 
-    ProjectRepositories ref = underTest.load(ProjectDataQuery.create().setModuleKey(project.key()));
-    assertThat(ref.fileData(project.key(), projectFile.path()).hash()).isEqualTo("123456");
-    assertThat(ref.fileData(module.key(), moduleFile.path()).hash()).isEqualTo("789456");
+    ProjectRepositories ref = underTest.load(ProjectDataQuery.create().setModuleKey(project.getDbKey()));
+    assertThat(ref.fileData(project.getDbKey(), projectFile.path()).hash()).isEqualTo("123456");
+    assertThat(ref.fileData(module.getDbKey(), moduleFile.path()).hash()).isEqualTo("789456");
   }
 
   @Test
@@ -596,10 +596,10 @@ public class ProjectDataLoaderMediumTest {
 
     dbSession.commit();
 
-    ProjectRepositories ref = underTest.load(ProjectDataQuery.create().setModuleKey(module.key()));
-    assertThat(ref.fileData(module.key(), moduleFile.path()).hash()).isEqualTo("789456");
-    assertThat(ref.fileData(module.key(), moduleFile.path()).revision()).isEqualTo("123456789");
-    assertThat(ref.fileData(project.key(), projectFile.path())).isNull();
+    ProjectRepositories ref = underTest.load(ProjectDataQuery.create().setModuleKey(module.getDbKey()));
+    assertThat(ref.fileData(module.getDbKey(), moduleFile.path()).hash()).isEqualTo("789456");
+    assertThat(ref.fileData(module.getDbKey(), moduleFile.path()).revision()).isEqualTo("123456789");
+    assertThat(ref.fileData(project.getDbKey(), projectFile.path())).isNull();
   }
 
   private void addDefaultProfile() {

server/sonar-server/src/test/java/org/sonar/server/batch/ProjectDataLoaderTest.java

@@ -116,7 +116,7 @@ public class ProjectDataLoaderTest {
         .setProjectUuid(uuid)
         .setScope(scope)
         .setQualifier(qualifier)
-        .setKey(key));
+        .setDbKey(key));
       dbSession.commit();
 
       try {
@@ -136,7 +136,7 @@ public class ProjectDataLoaderTest {
     expectedException.expect(ForbiddenException.class);
     expectedException.expectMessage("You're not authorized to execute any SonarQube analysis");
 
-    underTest.load(ProjectDataQuery.create().setModuleKey(project.key()));
+    underTest.load(ProjectDataQuery.create().setModuleKey(project.getDbKey()));
   }
 
   @Test
@@ -147,7 +147,7 @@ public class ProjectDataLoaderTest {
     expectedException.expect(ForbiddenException.class);
     expectedException.expectMessage("You're only authorized to execute a local (preview) SonarQube analysis without pushing the results to the SonarQube server");
 
-    underTest.load(ProjectDataQuery.create().setModuleKey(project.key()));
+    underTest.load(ProjectDataQuery.create().setModuleKey(project.getDbKey()));
   }
 
   @Test
@@ -155,7 +155,7 @@ public class ProjectDataLoaderTest {
     ComponentDto project = dbTester.components().insertPrivateProject();
     userSession.logIn().addProjectPermission(UserRole.USER, project);
 
-    ProjectRepositories repositories = underTest.load(ProjectDataQuery.create().setModuleKey(project.key()).setIssuesMode(true));
+    ProjectRepositories repositories = underTest.load(ProjectDataQuery.create().setModuleKey(project.getDbKey()).setIssuesMode(true));
 
     assertThat(repositories).isNotNull();
   }
@@ -168,7 +168,7 @@ public class ProjectDataLoaderTest {
     expectedException.expect(ForbiddenException.class);
     expectedException.expectMessage("You don't have the required permissions to access this project");
 
-    underTest.load(ProjectDataQuery.create().setModuleKey(project.key()).setIssuesMode(true));
+    underTest.load(ProjectDataQuery.create().setModuleKey(project.getDbKey()).setIssuesMode(true));
   }
 
   @Test
@@ -177,7 +177,7 @@ public class ProjectDataLoaderTest {
     userSession.logIn().addPermission(SCAN, project.getOrganizationUuid());
     userSession.logIn().addProjectPermission(UserRole.USER, project);
 
-    ProjectRepositories repositories = underTest.load(ProjectDataQuery.create().setModuleKey(project.key()).setIssuesMode(true));
+    ProjectRepositories repositories = underTest.load(ProjectDataQuery.create().setModuleKey(project.getDbKey()).setIssuesMode(true));
 
     assertThat(repositories).isNotNull();
   }

server/sonar-server/src/test/java/org/sonar/server/ce/ws/ActivityStatusActionTest.java

@@ -120,7 +120,7 @@ public class ActivityStatusActionTest {
     db.components().insertComponent(project);
     expectedException.expect(IllegalArgumentException.class);
 
-    callByComponentUuidOrComponentKey(project.uuid(), project.key());
+    callByComponentUuidOrComponentKey(project.uuid(), project.getDbKey());
   }
 
   @Test
@@ -155,7 +155,7 @@ public class ActivityStatusActionTest {
     expectedException.expect(ForbiddenException.class);
     expectedException.expectMessage("Insufficient privileges");
 
-    callByComponentKey(project.key());
+    callByComponentKey(project.getDbKey());
   }
 
   private void insertInQueue(CeQueueDto.Status status, @Nullable String componentUuid) {

server/sonar-server/src/test/java/org/sonar/server/ce/ws/ComponentActionTest.java

@@ -102,7 +102,7 @@ public class ComponentActionTest {
     insertActivity("T1", project.uuid(), CeActivityDto.Status.SUCCESS);
 
     WsCe.ProjectResponse response = ws.newRequest()
-      .setParam(PARAM_COMPONENT_KEY, project.key())
+      .setParam(PARAM_COMPONENT_KEY, project.getDbKey())
       .executeProtobuf(WsCe.ProjectResponse.class);
     assertThat(response.hasCurrent()).isTrue();
   }

server/sonar-server/src/test/java/org/sonar/server/ce/ws/TaskActionTest.java

@@ -88,7 +88,7 @@ public class TaskActionTest {
     assertThat(taskResponse.getTask().getStatus()).isEqualTo(WsCe.TaskStatus.PENDING);
     assertThat(taskResponse.getTask().getSubmitterLogin()).isEqualTo("john");
     assertThat(taskResponse.getTask().getComponentId()).isEqualTo(project.uuid());
-    assertThat(taskResponse.getTask().getComponentKey()).isEqualTo(project.key());
+    assertThat(taskResponse.getTask().getComponentKey()).isEqualTo(project.getDbKey());
     assertThat(taskResponse.getTask().getComponentName()).isEqualTo(project.name());
     assertThat(taskResponse.getTask().hasExecutionTimeMs()).isFalse();
     assertThat(taskResponse.getTask().getLogs()).isFalse();
@@ -109,7 +109,7 @@ public class TaskActionTest {
     assertThat(task.getId()).isEqualTo(SOME_TASK_UUID);
     assertThat(task.getStatus()).isEqualTo(WsCe.TaskStatus.FAILED);
     assertThat(task.getComponentId()).isEqualTo(project.uuid());
-    assertThat(task.getComponentKey()).isEqualTo(project.key());
+    assertThat(task.getComponentKey()).isEqualTo(project.getDbKey());
     assertThat(task.getComponentName()).isEqualTo(project.name());
     assertThat(task.getAnalysisId()).isEqualTo(activityDto.getAnalysisUuid());
     assertThat(task.getExecutionTimeMs()).isEqualTo(500L);

server/sonar-server/src/test/java/org/sonar/server/ce/ws/TaskFormatterTest.java

@@ -78,7 +78,7 @@ public class TaskFormatterTest {
   public void formatQueue_with_component_and_other_fields() throws IOException {
     String uuid = "COMPONENT_UUID";
     OrganizationDto organizationDto = db.organizations().insert();
-    db.components().insertPrivateProject(organizationDto, (t) -> t.setUuid(uuid).setKey("COMPONENT_KEY").setName("Component Name"));
+    db.components().insertPrivateProject(organizationDto, (t) -> t.setUuid(uuid).setDbKey("COMPONENT_KEY").setName("Component Name"));
 
     CeQueueDto dto = new CeQueueDto();
     dto.setUuid("UUID");

server/sonar-server/src/test/java/org/sonar/server/component/ComponentCleanerServiceTest.java

@@ -130,7 +130,7 @@ public class ComponentCleanerServiceTest {
   private DbData insertData(int id) {
     String suffix = String.valueOf(id);
     ComponentDto project = newPrivateProjectDto(db.organizations().insert(), "project-uuid-" + suffix)
-      .setKey("project-key-" + suffix);
+      .setDbKey("project-key-" + suffix);
     RuleDefinitionDto rule = RuleTesting.newRule(RuleKey.of("sonarqube", "rule-" + suffix));
     dbClient.ruleDao().insert(dbSession, rule);
     IssueDto issue = IssueTesting.newIssue(rule, project, project).setKee("issue-key-" + suffix).setUpdatedAt(new Date().getTime());

server/sonar-server/src/test/java/org/sonar/server/component/ComponentFinderTest.java

@@ -106,7 +106,7 @@ public class ComponentFinderTest {
   @Test
   public void fail_when_component_key_is_removed() {
     ComponentDto project = db.components().insertComponent(newPrivateProjectDto(db.getDefaultOrganization()));
-    db.components().insertComponent(newFileDto(project).setKey("file-key").setEnabled(false));
+    db.components().insertComponent(newFileDto(project).setDbKey("file-key").setEnabled(false));
 
 
     expectedException.expect(NotFoundException.class);
@@ -126,10 +126,10 @@ public class ComponentFinderTest {
 
   @Test
   public void get_component_by_key() {
-    db.components().insertComponent(newPrivateProjectDto(db.getDefaultOrganization()).setKey("project-key"));
+    db.components().insertComponent(newPrivateProjectDto(db.getDefaultOrganization()).setDbKey("project-key"));
 
     ComponentDto component = underTest.getByUuidOrKey(dbSession, null, "project-key", ID_AND_KEY);
 
-    assertThat(component.key()).isEqualTo("project-key");
+    assertThat(component.getDbKey()).isEqualTo("project-key");
   }
 }

server/sonar-server/src/test/java/org/sonar/server/component/ComponentServiceTest.java

@@ -54,19 +54,19 @@ public class ComponentServiceTest {
 
   @Test
   public void bulk_update() {
-    ComponentDto project = componentDb.insertComponent(ComponentTesting.newPrivateProjectDto(dbTester.organizations().insert()).setKey("my_project"));
-    ComponentDto module = componentDb.insertComponent(newModuleDto(project).setKey("my_project:root:module"));
-    ComponentDto inactiveModule = componentDb.insertComponent(newModuleDto(project).setKey("my_project:root:inactive_module").setEnabled(false));
-    ComponentDto file = componentDb.insertComponent(newFileDto(module, null).setKey("my_project:root:module:src/File.xoo"));
-    ComponentDto inactiveFile = componentDb.insertComponent(newFileDto(module, null).setKey("my_project:root:module:src/InactiveFile.xoo").setEnabled(false));
+    ComponentDto project = componentDb.insertComponent(ComponentTesting.newPrivateProjectDto(dbTester.organizations().insert()).setDbKey("my_project"));
+    ComponentDto module = componentDb.insertComponent(newModuleDto(project).setDbKey("my_project:root:module"));
+    ComponentDto inactiveModule = componentDb.insertComponent(newModuleDto(project).setDbKey("my_project:root:inactive_module").setEnabled(false));
+    ComponentDto file = componentDb.insertComponent(newFileDto(module, null).setDbKey("my_project:root:module:src/File.xoo"));
+    ComponentDto inactiveFile = componentDb.insertComponent(newFileDto(module, null).setDbKey("my_project:root:module:src/InactiveFile.xoo").setEnabled(false));
 
     underTest.bulkUpdateKey(dbSession, project, "my_", "your_");
 
-    assertComponentKeyUpdated(project.key(), "your_project");
-    assertComponentKeyUpdated(module.key(), "your_project:root:module");
-    assertComponentKeyUpdated(file.key(), "your_project:root:module:src/File.xoo");
-    assertComponentKeyNotUpdated(inactiveModule.key());
-    assertComponentKeyNotUpdated(inactiveFile.key());
+    assertComponentKeyUpdated(project.getDbKey(), "your_project");
+    assertComponentKeyUpdated(module.getDbKey(), "your_project:root:module");
+    assertComponentKeyUpdated(file.getDbKey(), "your_project:root:module:src/File.xoo");
+    assertComponentKeyNotUpdated(inactiveModule.getDbKey());
+    assertComponentKeyNotUpdated(inactiveFile.getDbKey());
   }
 
   private void assertComponentKeyUpdated(String oldKey, String newKey) {

server/sonar-server/src/test/java/org/sonar/server/component/ComponentServiceUpdateKeyTest.java

@@ -60,8 +60,8 @@ public class ComponentServiceUpdateKeyTest {
   @Test
   public void update_project_key() {
     ComponentDto project = insertSampleRootProject();
-    ComponentDto file = componentDb.insertComponent(ComponentTesting.newFileDto(project, null).setKey("sample:root:src/File.xoo"));
-    ComponentDto inactiveFile = componentDb.insertComponent(ComponentTesting.newFileDto(project, null).setKey("sample:root:src/InactiveFile.xoo").setEnabled(false));
+    ComponentDto file = componentDb.insertComponent(ComponentTesting.newFileDto(project, null).setDbKey("sample:root:src/File.xoo"));
+    ComponentDto inactiveFile = componentDb.insertComponent(ComponentTesting.newFileDto(project, null).setDbKey("sample:root:src/InactiveFile.xoo").setEnabled(false));
 
     dbSession.commit();
 
@@ -70,14 +70,14 @@ public class ComponentServiceUpdateKeyTest {
     dbSession.commit();
 
     // Check project key has been updated
-    assertThat(db.getDbClient().componentDao().selectByKey(dbSession, project.key())).isAbsent();
+    assertThat(db.getDbClient().componentDao().selectByKey(dbSession, project.getDbKey())).isAbsent();
     assertThat(db.getDbClient().componentDao().selectByKey(dbSession, "sample2:root")).isNotNull();
 
     // Check file key has been updated
-    assertThat(db.getDbClient().componentDao().selectByKey(dbSession, file.key())).isAbsent();
+    assertThat(db.getDbClient().componentDao().selectByKey(dbSession, file.getDbKey())).isAbsent();
     assertThat(db.getDbClient().componentDao().selectByKey(dbSession, "sample2:root:src/File.xoo")).isNotNull();
 
-    assertThat(dbClient.componentDao().selectByKey(dbSession, inactiveFile.getKey())).isPresent();
+    assertThat(dbClient.componentDao().selectByKey(dbSession, inactiveFile.getDbKey())).isPresent();
 
     org.assertj.core.api.Assertions.assertThat(projectIndexers.hasBeenCalled(project.uuid(), ProjectIndexer.Cause.PROJECT_KEY_UPDATE)).isTrue();
   }
@@ -85,18 +85,18 @@ public class ComponentServiceUpdateKeyTest {
   @Test
   public void update_module_key() {
     ComponentDto project = insertSampleRootProject();
-    ComponentDto module = ComponentTesting.newModuleDto(project).setKey("sample:root:module");
+    ComponentDto module = ComponentTesting.newModuleDto(project).setDbKey("sample:root:module");
     db.components().insertComponent(module);
-    ComponentDto file = ComponentTesting.newFileDto(module, null).setKey("sample:root:module:src/File.xoo");
+    ComponentDto file = ComponentTesting.newFileDto(module, null).setDbKey("sample:root:module:src/File.xoo");
     db.components().insertComponent(file);
     logInAsProjectAdministrator(project);
 
     underTest.updateKey(dbSession, module, "sample:root2:module");
     dbSession.commit();
 
-    assertThat(dbClient.componentDao().selectByKey(dbSession, project.key())).isPresent();
-    assertComponentKeyHasBeenUpdated(module.key(), "sample:root2:module");
-    assertComponentKeyHasBeenUpdated(file.key(), "sample:root2:module:src/File.xoo");
+    assertThat(dbClient.componentDao().selectByKey(dbSession, project.getDbKey())).isPresent();
+    assertComponentKeyHasBeenUpdated(module.getDbKey(), "sample:root2:module");
+    assertComponentKeyHasBeenUpdated(file.getDbKey(), "sample:root2:module:src/File.xoo");
 
     // do not index the module but the project
     org.assertj.core.api.Assertions.assertThat(projectIndexers.hasBeenCalled(project.uuid(), ProjectIndexer.Cause.PROJECT_KEY_UPDATE)).isTrue();
@@ -112,7 +112,7 @@ public class ComponentServiceUpdateKeyTest {
     underTest.updateKey(dbSession, provisionedProject, "provisionedProject2");
     dbSession.commit();
 
-    assertComponentKeyHasBeenUpdated(provisionedProject.key(), "provisionedProject2");
+    assertComponentKeyHasBeenUpdated(provisionedProject.getDbKey(), "provisionedProject2");
     org.assertj.core.api.Assertions.assertThat(projectIndexers.hasBeenCalled(provisionedProject.uuid(), ProjectIndexer.Cause.PROJECT_KEY_UPDATE)).isTrue();
   }
 
@@ -133,9 +133,9 @@ public class ComponentServiceUpdateKeyTest {
     logInAsProjectAdministrator(project);
 
     expectedException.expect(IllegalArgumentException.class);
-    expectedException.expectMessage("Impossible to update key: a component with key \"" + anotherProject.key() + "\" already exists.");
+    expectedException.expectMessage("Impossible to update key: a component with key \"" + anotherProject.getDbKey() + "\" already exists.");
 
-    underTest.updateKey(dbSession, project, anotherProject.key());
+    underTest.updateKey(dbSession, project, anotherProject.getDbKey());
   }
 
   @Test
@@ -174,19 +174,19 @@ public class ComponentServiceUpdateKeyTest {
 
   @Test
   public void bulk_update_key() {
-    ComponentDto project = componentDb.insertComponent(ComponentTesting.newPrivateProjectDto(db.organizations().insert()).setKey("my_project"));
-    ComponentDto module = componentDb.insertComponent(newModuleDto(project).setKey("my_project:root:module"));
-    ComponentDto inactiveModule = componentDb.insertComponent(newModuleDto(project).setKey("my_project:root:inactive_module").setEnabled(false));
-    ComponentDto file = componentDb.insertComponent(newFileDto(module, null).setKey("my_project:root:module:src/File.xoo"));
-    ComponentDto inactiveFile = componentDb.insertComponent(newFileDto(module, null).setKey("my_project:root:module:src/InactiveFile.xoo").setEnabled(false));
+    ComponentDto project = componentDb.insertComponent(ComponentTesting.newPrivateProjectDto(db.organizations().insert()).setDbKey("my_project"));
+    ComponentDto module = componentDb.insertComponent(newModuleDto(project).setDbKey("my_project:root:module"));
+    ComponentDto inactiveModule = componentDb.insertComponent(newModuleDto(project).setDbKey("my_project:root:inactive_module").setEnabled(false));
+    ComponentDto file = componentDb.insertComponent(newFileDto(module, null).setDbKey("my_project:root:module:src/File.xoo"));
+    ComponentDto inactiveFile = componentDb.insertComponent(newFileDto(module, null).setDbKey("my_project:root:module:src/InactiveFile.xoo").setEnabled(false));
 
     underTest.bulkUpdateKey(dbSession, project, "my_", "your_");
 
-    assertComponentKeyUpdated(project.key(), "your_project");
-    assertComponentKeyUpdated(module.key(), "your_project:root:module");
-    assertComponentKeyUpdated(file.key(), "your_project:root:module:src/File.xoo");
-    assertComponentKeyNotUpdated(inactiveModule.key());
-    assertComponentKeyNotUpdated(inactiveFile.key());
+    assertComponentKeyUpdated(project.getDbKey(), "your_project");
+    assertComponentKeyUpdated(module.getDbKey(), "your_project:root:module");
+    assertComponentKeyUpdated(file.getDbKey(), "your_project:root:module:src/File.xoo");
+    assertComponentKeyNotUpdated(inactiveModule.getDbKey());
+    assertComponentKeyNotUpdated(inactiveFile.getDbKey());
   }
 
   private void assertComponentKeyUpdated(String oldKey, String newKey) {
@@ -203,7 +203,7 @@ public class ComponentServiceUpdateKeyTest {
   }
 
   private ComponentDto insertProject(String key) {
-    ComponentDto project = componentDb.insertComponent(ComponentTesting.newPrivateProjectDto(db.organizations().insert()).setKey(key));
+    ComponentDto project = componentDb.insertComponent(ComponentTesting.newPrivateProjectDto(db.organizations().insert()).setDbKey(key));
     return project;
   }
 

server/sonar-server/src/test/java/org/sonar/server/component/ComponentUpdaterTest.java

@@ -78,7 +78,7 @@ public class ComponentUpdaterTest {
     ComponentDto returned = underTest.create(db.getSession(), project, null);
 
     ComponentDto loaded = db.getDbClient().componentDao().selectOrFailByUuid(db.getSession(), returned.uuid());
-    assertThat(loaded.getKey()).isEqualTo(DEFAULT_PROJECT_KEY);
+    assertThat(loaded.getDbKey()).isEqualTo(DEFAULT_PROJECT_KEY);
     assertThat(loaded.deprecatedKey()).isEqualTo(DEFAULT_PROJECT_KEY);
     assertThat(loaded.name()).isEqualTo(DEFAULT_PROJECT_NAME);
     assertThat(loaded.longName()).isEqualTo(DEFAULT_PROJECT_NAME);
@@ -135,7 +135,7 @@ public class ComponentUpdaterTest {
         .build(),
       null);
 
-    assertThat(project.getKey()).isEqualTo("project-key:origin/master");
+    assertThat(project.getDbKey()).isEqualTo("project-key:origin/master");
   }
 
   @Test
@@ -150,7 +150,7 @@ public class ComponentUpdaterTest {
     ComponentDto returned = underTest.create(db.getSession(), view, null);
 
     ComponentDto loaded = db.getDbClient().componentDao().selectOrFailByUuid(db.getSession(), returned.uuid());
-    assertThat(loaded.getKey()).isEqualTo("view-key");
+    assertThat(loaded.getDbKey()).isEqualTo("view-key");
     assertThat(loaded.name()).isEqualTo("view-name");
     assertThat(loaded.qualifier()).isEqualTo("VW");
     assertThat(projectIndexers.hasBeenCalled(loaded.uuid(), ProjectIndexer.Cause.PROJECT_CREATION)).isTrue();
@@ -168,7 +168,7 @@ public class ComponentUpdaterTest {
     ComponentDto returned = underTest.create(db.getSession(), view, null);
 
     ComponentDto loaded = db.getDbClient().componentDao().selectOrFailByUuid(db.getSession(), returned.uuid());
-    assertThat(loaded.getKey()).isEqualTo("app-key");
+    assertThat(loaded.getDbKey()).isEqualTo("app-key");
     assertThat(loaded.name()).isEqualTo("app-name");
     assertThat(loaded.qualifier()).isEqualTo("APP");
     assertThat(projectIndexers.hasBeenCalled(loaded.uuid(), ProjectIndexer.Cause.PROJECT_CREATION)).isTrue();
@@ -185,8 +185,8 @@ public class ComponentUpdaterTest {
 
     ComponentDto returned = underTest.create(db.getSession(), view, null);
 
-    ComponentDto loaded = db.getDbClient().componentDao().selectByKey(db.getSession(), returned.key()).get();
-    assertThat(loaded.getKey()).isEqualTo("app-key");
+    ComponentDto loaded = db.getDbClient().componentDao().selectByKey(db.getSession(), returned.getDbKey()).get();
+    assertThat(loaded.getDbKey()).isEqualTo("app-key");
     assertThat(loaded.name()).isEqualTo("app-name");
     assertThat(loaded.qualifier()).isEqualTo("APP");
     assertThat(projectIndexers.hasBeenCalled(loaded.uuid(), ProjectIndexer.Cause.PROJECT_CREATION)).isTrue();
@@ -254,11 +254,11 @@ public class ComponentUpdaterTest {
     ComponentDto existing = db.components().insertPrivateProject();
 
     expectedException.expect(BadRequestException.class);
-    expectedException.expectMessage("Could not create Project, key already exists: " + existing.key());
+    expectedException.expectMessage("Could not create Project, key already exists: " + existing.getDbKey());
 
     underTest.create(db.getSession(),
       NewComponent.newComponentBuilder()
-        .setKey(existing.key())
+        .setKey(existing.getDbKey())
         .setName(DEFAULT_PROJECT_NAME)
         .setOrganizationUuid(existing.getOrganizationUuid())
         .build(),
@@ -270,11 +270,11 @@ public class ComponentUpdaterTest {
     ComponentDto existing = db.components().insertPrivateProject(db.organizations().insert());
 
     expectedException.expect(BadRequestException.class);
-    expectedException.expectMessage("Could not create Project, key already exists: " + existing.key());
+    expectedException.expectMessage("Could not create Project, key already exists: " + existing.getDbKey());
 
     underTest.create(db.getSession(),
       NewComponent.newComponentBuilder()
-        .setKey(existing.key())
+        .setKey(existing.getDbKey())
         .setName(DEFAULT_PROJECT_NAME)
         .setOrganizationUuid(existing.getOrganizationUuid())
         .build(),

server/sonar-server/src/test/java/org/sonar/server/component/index/ComponentIndexFeatureFavoriteTest.java

@@ -46,14 +46,14 @@ public class ComponentIndexFeatureFavoriteTest extends ComponentIndexTest {
     ComponentIndexQuery query1 = ComponentIndexQuery.builder()
       .setQuery("SonarQube")
       .setQualifiers(singletonList(PROJECT))
-      .setFavoriteKeys(of(project1.getKey()))
+      .setFavoriteKeys(of(project1.getDbKey()))
       .build();
     assertSearch(query1).containsExactly(uuids(project1, project2));
 
     ComponentIndexQuery query2 = ComponentIndexQuery.builder()
       .setQuery("SonarQube")
       .setQualifiers(singletonList(PROJECT))
-      .setFavoriteKeys(of(project2.getKey()))
+      .setFavoriteKeys(of(project2.getDbKey()))
       .build();
     assertSearch(query2).containsExactly(uuids(project2, project1));
   }
@@ -66,7 +66,7 @@ public class ComponentIndexFeatureFavoriteTest extends ComponentIndexTest {
     ComponentIndexQuery query1 = ComponentIndexQuery.builder()
       .setQuery("bar")
       .setQualifiers(singletonList(PROJECT))
-      .setFavoriteKeys(of(project1.getKey()))
+      .setFavoriteKeys(of(project1.getDbKey()))
       .build();
     assertSearch(query1).isEmpty();
   }

server/sonar-server/src/test/java/org/sonar/server/component/index/ComponentIndexFeatureRecentlyBrowsedTest.java

@@ -45,14 +45,14 @@ public class ComponentIndexFeatureRecentlyBrowsedTest extends ComponentIndexTest
     ComponentIndexQuery query1 = ComponentIndexQuery.builder()
       .setQuery("SonarQube")
       .setQualifiers(Collections.singletonList(PROJECT))
-      .setRecentlyBrowsedKeys(of(project1.getKey()))
+      .setRecentlyBrowsedKeys(of(project1.getDbKey()))
       .build();
     assertSearch(query1).containsExactly(uuids(project1, project2));
 
     ComponentIndexQuery query2 = ComponentIndexQuery.builder()
       .setQuery("SonarQube")
       .setQualifiers(Collections.singletonList(PROJECT))
-      .setRecentlyBrowsedKeys(of(project2.getKey()))
+      .setRecentlyBrowsedKeys(of(project2.getDbKey()))
       .build();
     assertSearch(query2).containsExactly(uuids(project2, project1));
   }

server/sonar-server/src/test/java/org/sonar/server/component/index/ComponentIndexScoreTest.java

@@ -121,15 +121,15 @@ public class ComponentIndexScoreTest extends ComponentIndexTest {
     assertSearch(ComponentIndexQuery.builder()
       .setQuery("File")
       .setQualifiers(asList(PROJECT, MODULE, FILE))
-      .setRecentlyBrowsedKeys(ImmutableSet.of(file1.getKey()))
-      .setFavoriteKeys(ImmutableSet.of(file2.getKey()))
+      .setRecentlyBrowsedKeys(ImmutableSet.of(file1.getDbKey()))
+      .setFavoriteKeys(ImmutableSet.of(file2.getDbKey()))
       .build()).containsExactly(uuids(file2, file1));
 
     assertSearch(ComponentIndexQuery.builder()
       .setQuery("File")
       .setQualifiers(asList(PROJECT, MODULE, FILE))
-      .setRecentlyBrowsedKeys(ImmutableSet.of(file2.getKey()))
-      .setFavoriteKeys(ImmutableSet.of(file1.getKey()))
+      .setRecentlyBrowsedKeys(ImmutableSet.of(file2.getDbKey()))
+      .setFavoriteKeys(ImmutableSet.of(file1.getDbKey()))
       .build()).containsExactly(uuids(file1, file2));
   }
 
@@ -160,12 +160,12 @@ public class ComponentIndexScoreTest extends ComponentIndexTest {
 
     index(ComponentTesting.newFileDto(project)
       .setName("DbTester.java")
-      .setKey("java/org/example/DbTester.java")
+      .setDbKey("java/org/example/DbTester.java")
       .setUuid("UUID-DbTester"));
 
     index(ComponentTesting.newFileDto(project)
       .setName("WebhookDbTesting.java")
-      .setKey("java/org/example/WebhookDbTesting.java")
+      .setDbKey("java/org/example/WebhookDbTesting.java")
       .setUuid("UUID-WebhookDbTesting"));
 
     assertSearch("dbt").containsExactly(

server/sonar-server/src/test/java/org/sonar/server/component/index/ComponentIndexTest.java

@@ -126,13 +126,13 @@ public abstract class ComponentIndexTest {
   protected ComponentDto indexProject(String key, String name) {
     return index(
       ComponentTesting.newPrivateProjectDto(organization, "UUID_" + key)
-        .setKey(key)
+        .setDbKey(key)
         .setName(name));
   }
 
   protected ComponentDto newProject(String key, String name) {
     return ComponentTesting.newPrivateProjectDto(organization, "UUID_" + key)
-      .setKey(key)
+      .setDbKey(key)
       .setName(name);
   }
 
@@ -144,7 +144,7 @@ public abstract class ComponentIndexTest {
   protected ComponentDto indexFile(ComponentDto project, String fileKey, String fileName) {
     return index(
       ComponentTesting.newFileDto(project)
-        .setKey(fileKey)
+        .setDbKey(fileKey)
         .setName(fileName));
   }
 

server/sonar-server/src/test/java/org/sonar/server/component/ws/AppActionTest.java

@@ -140,12 +140,12 @@ public class AppActionTest {
   private ComponentDto[] insertComponentsAndAnalysis() {
     ComponentDto project = ComponentTesting.newPrivateProjectDto(dbTester.getDefaultOrganization(), PROJECT_UUID)
       .setLongName("SonarQube")
-      .setKey(PROJECT_KEY);
+      .setDbKey(PROJECT_KEY);
     ComponentDto module = ComponentTesting.newModuleDto(MODULE_UUID, project)
       .setLongName("SonarQube :: Plugin API")
-      .setKey(MODULE_KEY);
+      .setDbKey(MODULE_KEY);
     ComponentDto file = ComponentTesting.newFileDto(module, null, FILE_UUID)
-      .setKey(FILE_KEY)
+      .setDbKey(FILE_KEY)
       .setName("Plugin.java")
       .setLongName("src/main/java/org/sonar/api/Plugin.java")
       .setPath("src/main/java/org/sonar/api/Plugin.java");

server/sonar-server/src/test/java/org/sonar/server/component/ws/SearchActionTest.java

@@ -125,8 +125,8 @@ public class SearchActionTest {
   @Test
   public void search_by_key_query() throws IOException {
     insertProjectsAuthorizedForUser(
-      ComponentTesting.newPrivateProjectDto(db.getDefaultOrganization()).setKey("project-_%-key"),
-      ComponentTesting.newPrivateProjectDto(db.getDefaultOrganization()).setKey("project-key-without-escaped-characters"));
+      ComponentTesting.newPrivateProjectDto(db.getDefaultOrganization()).setDbKey("project-_%-key"),
+      ComponentTesting.newPrivateProjectDto(db.getDefaultOrganization()).setDbKey("project-key-without-escaped-characters"));
 
     SearchWsResponse response = call(new SearchWsRequest().setQuery("project-_%-key").setQualifiers(singletonList(PROJECT)));
 
@@ -136,14 +136,14 @@ public class SearchActionTest {
   @Test
   public void search_for_files() throws IOException {
     ComponentDto project = ComponentTesting.newPrivateProjectDto(db.getDefaultOrganization());
-    ComponentDto file1 = newFileDto(project).setKey("file1");
-    ComponentDto file2 = newFileDto(project).setKey("file2");
+    ComponentDto file1 = newFileDto(project).setDbKey("file1");
+    ComponentDto file2 = newFileDto(project).setDbKey("file2");
     db.components().insertComponents(project, file1, file2);
     setBrowsePermissionOnUser(project);
 
-    SearchWsResponse response = call(new SearchWsRequest().setQuery(file1.key()).setQualifiers(singletonList(FILE)));
+    SearchWsResponse response = call(new SearchWsRequest().setQuery(file1.getDbKey()).setQualifiers(singletonList(FILE)));
 
-    assertThat(response.getComponentsList()).extracting(Component::getKey).containsOnly(file1.getKey());
+    assertThat(response.getComponentsList()).extracting(Component::getKey).containsOnly(file1.getDbKey());
   }
 
   @Test
@@ -151,7 +151,7 @@ public class SearchActionTest {
     OrganizationDto organizationDto = db.organizations().insert();
     List<ComponentDto> componentDtoList = new ArrayList<>();
     for (int i = 1; i <= 9; i++) {
-      componentDtoList.add(newPrivateProjectDto(organizationDto, "project-uuid-" + i).setKey("project-key-" + i).setName("Project Name " + i));
+      componentDtoList.add(newPrivateProjectDto(organizationDto, "project-uuid-" + i).setDbKey("project-key-" + i).setName("Project Name " + i));
     }
     insertProjectsAuthorizedForUser(componentDtoList.toArray(new ComponentDto[] {}));
 
@@ -164,8 +164,8 @@ public class SearchActionTest {
   public void search_with_language() throws IOException {
     OrganizationDto organizationDto = db.organizations().insert();
     insertProjectsAuthorizedForUser(
-      ComponentTesting.newPrivateProjectDto(organizationDto).setKey("java-project").setLanguage("java"),
-      ComponentTesting.newPrivateProjectDto(organizationDto).setKey("cpp-project").setLanguage("cpp"));
+      ComponentTesting.newPrivateProjectDto(organizationDto).setDbKey("java-project").setLanguage("java"),
+      ComponentTesting.newPrivateProjectDto(organizationDto).setDbKey("cpp-project").setLanguage("cpp"));
 
     SearchWsResponse response = call(new SearchWsRequest().setOrganization(organizationDto.getKey()).setLanguage("java").setQualifiers(singletonList(PROJECT)));
 
@@ -175,35 +175,35 @@ public class SearchActionTest {
   @Test
   public void return_only_components_from_projects_on_which_user_has_browse_permission() throws IOException {
     ComponentDto project1 = ComponentTesting.newPrivateProjectDto(db.getDefaultOrganization());
-    ComponentDto file1 = newFileDto(project1).setKey("file1");
-    ComponentDto file2 = newFileDto(project1).setKey("file2");
+    ComponentDto file1 = newFileDto(project1).setDbKey("file1");
+    ComponentDto file2 = newFileDto(project1).setDbKey("file2");
     ComponentDto project2 = ComponentTesting.newPrivateProjectDto(db.getDefaultOrganization());
-    ComponentDto file3 = newFileDto(project2).setKey("file3");
+    ComponentDto file3 = newFileDto(project2).setDbKey("file3");
     db.components().insertComponents(project1, file1, file2, project2, file3);
     setBrowsePermissionOnUser(project1);
 
     SearchWsResponse response = call(new SearchWsRequest().setQualifiers(singletonList(FILE)));
 
-    assertThat(response.getComponentsList()).extracting(Component::getKey).containsOnly(file1.getKey(), file2.getKey());
+    assertThat(response.getComponentsList()).extracting(Component::getKey).containsOnly(file1.getDbKey(), file2.getDbKey());
   }
 
   @Test
   public void return_project_key() throws IOException {
     ComponentDto project = ComponentTesting.newPublicProjectDto(db.getDefaultOrganization());
     ComponentDto module = ComponentTesting.newModuleDto(project);
-    ComponentDto file1 = newFileDto(module).setKey("file1");
-    ComponentDto file2 = newFileDto(module).setKey("file2");
-    ComponentDto file3 = newFileDto(project).setKey("file3");
+    ComponentDto file1 = newFileDto(module).setDbKey("file1");
+    ComponentDto file2 = newFileDto(module).setDbKey("file2");
+    ComponentDto file3 = newFileDto(project).setDbKey("file3");
     db.components().insertComponents(project, module, file1, file2, file3);
 
     SearchWsResponse response = call(new SearchWsRequest().setQualifiers(asList(PROJECT, MODULE, FILE)));
 
     assertThat(response.getComponentsList()).extracting(Component::getKey, Component::getProject)
-      .containsOnly(tuple(project.getKey(), project.getKey()),
-        tuple(module.getKey(), project.getKey()),
-        tuple(file1.getKey(), project.getKey()),
-        tuple(file2.getKey(), project.getKey()),
-        tuple(file3.getKey(), project.getKey()));
+      .containsOnly(tuple(project.getDbKey(), project.getDbKey()),
+        tuple(module.getDbKey(), project.getDbKey()),
+        tuple(file1.getDbKey(), project.getDbKey()),
+        tuple(file2.getDbKey(), project.getDbKey()),
+        tuple(file3.getDbKey(), project.getDbKey()));
   }
 
   @Test
@@ -221,7 +221,7 @@ public class SearchActionTest {
     assertThat(call(request).getComponentsCount()).isZero();
 
     userSession.logIn().setRoot();
-    assertThat(call(request).getComponentsList()).extracting(Component::getKey).containsOnly(file1.getKey(), file2.getKey());
+    assertThat(call(request).getComponentsList()).extracting(Component::getKey).containsOnly(file1.getDbKey(), file2.getDbKey());
   }
 
   @Test
@@ -244,11 +244,11 @@ public class SearchActionTest {
   public void test_json_example() {
     OrganizationDto organizationDto = db.organizations().insertForKey("my-org-1");
     db.components().insertComponent(newView(organizationDto));
-    ComponentDto project = newPrivateProjectDto(organizationDto, "project-uuid").setName("Project Name").setKey("project-key");
-    ComponentDto module = newModuleDto("module-uuid", project).setName("Module Name").setKey("module-key");
-    ComponentDto directory = newDirectory(module, "path/to/directoy").setUuid("directory-uuid").setKey("directory-key").setName("Directory Name");
+    ComponentDto project = newPrivateProjectDto(organizationDto, "project-uuid").setName("Project Name").setDbKey("project-key");
+    ComponentDto module = newModuleDto("module-uuid", project).setName("Module Name").setDbKey("module-key");
+    ComponentDto directory = newDirectory(module, "path/to/directoy").setUuid("directory-uuid").setDbKey("directory-key").setName("Directory Name");
     db.components().insertComponents(project, module, directory,
-      newFileDto(module, directory, "file-uuid").setKey("file-key").setLanguage("java").setName("File Name"));
+      newFileDto(module, directory, "file-uuid").setDbKey("file-key").setLanguage("java").setName("File Name"));
     userSession.addProjectPermission(UserRole.USER, project);
 
     String response = ws.newRequest()

server/sonar-server/src/test/java/org/sonar/server/component/ws/SearchProjectsActionTest.java

@@ -89,7 +89,6 @@ import static org.sonar.core.util.stream.MoreCollectors.toList;
 import static org.sonar.server.computation.task.projectanalysis.metric.Metric.MetricType.DATA;
 import static org.sonar.server.computation.task.projectanalysis.metric.Metric.MetricType.PERCENT;
 import static org.sonar.server.computation.task.projectanalysis.metric.Metric.MetricType.RATING;
-import static org.sonar.server.es.ProjectIndexer.Cause.PROJECT_CREATION;
 import static org.sonar.test.JsonAssert.assertJson;
 import static org.sonarqube.ws.client.component.ComponentsWsParameters.PARAM_FILTER;
 import static org.sonarqube.ws.client.component.ComponentsWsParameters.PARAM_ORGANIZATION;
@@ -198,14 +197,14 @@ public class SearchProjectsActionTest {
     OrganizationDto organization1Dto = db.organizations().insertForKey("my-org-key-1");
     OrganizationDto organization2Dto = db.organizations().insertForKey("my-org-key-2");
     ComponentDto project1 = insertProject(organization1Dto, c -> c
-      .setKey(KeyExamples.KEY_PROJECT_EXAMPLE_001)
+      .setDbKey(KeyExamples.KEY_PROJECT_EXAMPLE_001)
       .setName("My Project 1")
       .setTagsString("finance, java"));
     insertProject(organization1Dto, c -> c
-      .setKey(KeyExamples.KEY_PROJECT_EXAMPLE_002)
+      .setDbKey(KeyExamples.KEY_PROJECT_EXAMPLE_002)
       .setName("My Project 2"));
     insertProject(organization2Dto, c -> c
-      .setKey(KeyExamples.KEY_PROJECT_EXAMPLE_003)
+      .setDbKey(KeyExamples.KEY_PROJECT_EXAMPLE_003)
       .setName("My Project 3")
       .setTagsString("sales, offshore, java"));
     addFavourite(project1);
@@ -277,7 +276,7 @@ public class SearchProjectsActionTest {
 
     SearchProjectsWsResponse result = call(request.setFilter("coverage <= 80 and ncloc <= 10000"));
 
-    assertThat(result.getComponentsList()).extracting(Component::getKey).containsExactly(project2.key());
+    assertThat(result.getComponentsList()).extracting(Component::getKey).containsExactly(project2.getDbKey());
   }
 
   @Test
@@ -293,13 +292,13 @@ public class SearchProjectsActionTest {
 
     assertThat(call(request.setOrganization(null)).getComponentsList())
       .extracting(Component::getKey)
-      .containsOnly(project1.getKey(), project2.getKey(), project3.getKey());
+      .containsOnly(project1.getDbKey(), project2.getDbKey(), project3.getDbKey());
     assertThat(call(request.setOrganization(organization1.getKey())).getComponentsList())
       .extracting(Component::getKey)
-      .containsOnly(project1.getKey(), project2.getKey());
+      .containsOnly(project1.getDbKey(), project2.getDbKey());
     assertThat(call(request.setOrganization(organization2.getKey())).getComponentsList())
       .extracting(Component::getKey)
-      .containsOnly(project3.getKey());
+      .containsOnly(project3.getDbKey());
   }
 
   @Test
@@ -315,7 +314,7 @@ public class SearchProjectsActionTest {
 
     assertThat(result.getComponentsList())
       .extracting(Component::getKey)
-      .containsExactlyInAnyOrder(project1.getKey(), project2.getKey());
+      .containsExactlyInAnyOrder(project1.getDbKey(), project2.getDbKey());
   }
 
   @Test
@@ -330,7 +329,7 @@ public class SearchProjectsActionTest {
 
     SearchProjectsWsResponse result = call(request.setFilter("languages IN (java, js, <null>)"));
 
-    assertThat(result.getComponentsList()).extracting(Component::getKey).containsExactlyInAnyOrder(project1.getKey(), project2.getKey(), project4.getKey());
+    assertThat(result.getComponentsList()).extracting(Component::getKey).containsExactlyInAnyOrder(project1.getDbKey(), project2.getDbKey(), project4.getDbKey());
   }
 
   @Test
@@ -345,7 +344,7 @@ public class SearchProjectsActionTest {
 
     SearchProjectsWsResponse result = call(request.setFilter(metricKey + " = 2"));
 
-    assertThat(result.getComponentsList()).extracting(Component::getKey).containsExactly(project2.getKey());
+    assertThat(result.getComponentsList()).extracting(Component::getKey).containsExactly(project2.getDbKey());
   }
 
   @Test
@@ -360,7 +359,7 @@ public class SearchProjectsActionTest {
 
     SearchProjectsWsResponse result = call(request.setFilter(newMetricKey + " = 2"));
 
-    assertThat(result.getComponentsList()).extracting(Component::getKey).containsExactly(project2.getKey());
+    assertThat(result.getComponentsList()).extracting(Component::getKey).containsExactly(project2.getDbKey());
   }
 
   @Test
@@ -373,7 +372,7 @@ public class SearchProjectsActionTest {
 
     SearchProjectsWsResponse result = call(request.setFilter("tags in (finance, offshore)"));
 
-    assertThat(result.getComponentsList()).extracting(Component::getKey).containsExactlyInAnyOrder(project1.getKey(), project3.getKey());
+    assertThat(result.getComponentsList()).extracting(Component::getKey).containsExactlyInAnyOrder(project1.getDbKey(), project3.getDbKey());
   }
 
   @Test
@@ -387,7 +386,7 @@ public class SearchProjectsActionTest {
 
     SearchProjectsWsResponse result = call(request.setFilter("coverage <= 80"));
 
-    assertThat(result.getComponentsList()).extracting(Component::getKey).containsExactlyInAnyOrder(project1.getKey(), project3.key());
+    assertThat(result.getComponentsList()).extracting(Component::getKey).containsExactlyInAnyOrder(project1.getDbKey(), project3.getDbKey());
   }
 
   @Test
@@ -401,7 +400,7 @@ public class SearchProjectsActionTest {
 
     SearchProjectsWsResponse result = call(request.setFilter("new_coverage <= 80"));
 
-    assertThat(result.getComponentsList()).extracting(Component::getKey).containsExactlyInAnyOrder(project1.getKey(), project3.key());
+    assertThat(result.getComponentsList()).extracting(Component::getKey).containsExactlyInAnyOrder(project1.getDbKey(), project3.getDbKey());
   }
 
   @Test
@@ -415,7 +414,7 @@ public class SearchProjectsActionTest {
 
     SearchProjectsWsResponse result = call(request.setFilter("duplicated_lines_density <= 80"));
 
-    assertThat(result.getComponentsList()).extracting(Component::getKey).containsExactlyInAnyOrder(project1.getKey(), project3.key());
+    assertThat(result.getComponentsList()).extracting(Component::getKey).containsExactlyInAnyOrder(project1.getDbKey(), project3.getDbKey());
   }
 
   @Test
@@ -430,7 +429,7 @@ public class SearchProjectsActionTest {
 
     SearchProjectsWsResponse result = call(request.setFilter("duplicated_lines_density = NO_DATA"));
 
-    assertThat(result.getComponentsList()).extracting(Component::getKey).containsExactlyInAnyOrder(project1.getKey());
+    assertThat(result.getComponentsList()).extracting(Component::getKey).containsExactlyInAnyOrder(project1.getDbKey());
   }
 
   @Test
@@ -457,7 +456,7 @@ public class SearchProjectsActionTest {
 
     SearchProjectsWsResponse result = call(request.setFilter("new_duplicated_lines_density <= 80"));
 
-    assertThat(result.getComponentsList()).extracting(Component::getKey).containsExactlyInAnyOrder(project1.getKey(), project3.key());
+    assertThat(result.getComponentsList()).extracting(Component::getKey).containsExactlyInAnyOrder(project1.getDbKey(), project3.getDbKey());
   }
 
   @Test
@@ -471,7 +470,7 @@ public class SearchProjectsActionTest {
 
     SearchProjectsWsResponse result = call(request.setFilter("ncloc <= 80"));
 
-    assertThat(result.getComponentsList()).extracting(Component::getKey).containsExactlyInAnyOrder(project1.getKey(), project3.key());
+    assertThat(result.getComponentsList()).extracting(Component::getKey).containsExactlyInAnyOrder(project1.getDbKey(), project3.getDbKey());
   }
 
   @Test
@@ -485,17 +484,17 @@ public class SearchProjectsActionTest {
 
     SearchProjectsWsResponse result = call(request.setFilter("new_lines <= 80"));
 
-    assertThat(result.getComponentsList()).extracting(Component::getKey).containsExactlyInAnyOrder(project1.getKey(), project3.key());
+    assertThat(result.getComponentsList()).extracting(Component::getKey).containsExactlyInAnyOrder(project1.getDbKey(), project3.getDbKey());
   }
 
   @Test
   public void filter_projects_by_text_query() {
     userSession.logIn();
     OrganizationDto organizationDto = db.organizations().insert();
-    insertProject(organizationDto, c -> c.setKey("sonar-java").setName("Sonar Java"));
-    insertProject(organizationDto, c -> c.setKey("sonar-groovy").setName("Sonar Groovy"));
-    insertProject(organizationDto, c -> c.setKey("sonar-markdown").setName("Sonar Markdown"));
-    insertProject(organizationDto, c -> c.setKey("sonarqube").setName("Sonar Qube"));
+    insertProject(organizationDto, c -> c.setDbKey("sonar-java").setName("Sonar Java"));
+    insertProject(organizationDto, c -> c.setDbKey("sonar-groovy").setName("Sonar Groovy"));
+    insertProject(organizationDto, c -> c.setDbKey("sonar-markdown").setName("Sonar Markdown"));
+    insertProject(organizationDto, c -> c.setDbKey("sonarqube").setName("Sonar Qube"));
 
     assertThat(call(request.setFilter("query = \"Groovy\"")).getComponentsList()).extracting(Component::getName).containsOnly("Sonar Groovy");
     assertThat(call(request.setFilter("query = \"oNar\"")).getComponentsList()).extracting(Component::getName).containsOnly("Sonar Java", "Sonar Groovy", "Sonar Markdown",
@@ -561,7 +560,7 @@ public class SearchProjectsActionTest {
     SearchProjectsWsResponse result = call(request.setFilter("isFavorite"));
 
     assertThat(result.getComponentsCount()).isEqualTo(2);
-    assertThat(result.getComponentsList()).extracting(Component::getKey).containsExactly(javaProject.getKey(), markDownProject.getKey());
+    assertThat(result.getComponentsList()).extracting(Component::getKey).containsExactly(javaProject.getDbKey(), markDownProject.getDbKey());
   }
 
   @Test
@@ -945,9 +944,9 @@ public class SearchProjectsActionTest {
     ComponentDto project4 = insertProject(organizationDto, c -> c.setName("Sonar Qube"), new Measure(coverage, c -> c.setValue(80d)));
 
     assertThat(call(request.setSort(COVERAGE).setAsc(true)).getComponentsList()).extracting(Component::getKey)
-      .containsExactly(project3.getKey(), project4.getKey(), project2.getKey(), project1.getKey());
+      .containsExactly(project3.getDbKey(), project4.getDbKey(), project2.getDbKey(), project1.getDbKey());
     assertThat(call(request.setSort(COVERAGE).setAsc(false)).getComponentsList()).extracting(Component::getKey)
-      .containsExactly(project2.getKey(), project1.getKey(), project3.getKey(), project4.getKey());
+      .containsExactly(project2.getDbKey(), project1.getDbKey(), project3.getDbKey(), project4.getDbKey());
   }
 
   @Test
@@ -961,34 +960,34 @@ public class SearchProjectsActionTest {
     ComponentDto project4 = insertProject(organization, c -> c.setName("Sonar Qube"), new Measure(qualityGateStatus, c -> c.setData("OK")));
 
     assertThat(call(request.setSort(QUALITY_GATE_STATUS).setAsc(true)).getComponentsList()).extracting(Component::getKey)
-      .containsExactly(project3.getKey(), project4.getKey(), project2.getKey(), project1.getKey());
+      .containsExactly(project3.getDbKey(), project4.getDbKey(), project2.getDbKey(), project1.getDbKey());
     assertThat(call(request.setSort(QUALITY_GATE_STATUS).setAsc(false)).getComponentsList()).extracting(Component::getKey)
-      .containsExactly(project1.getKey(), project2.getKey(), project3.getKey(), project4.getKey());
+      .containsExactly(project1.getDbKey(), project2.getDbKey(), project3.getDbKey(), project4.getDbKey());
   }
 
   @Test
   public void sort_by_last_analysis_date() throws Exception {
     userSession.logIn();
     OrganizationDto organization = db.organizations().insert();
-    ComponentDto project1 = db.components().insertPublicProject(organization, p -> p.setKey("project1"));
+    ComponentDto project1 = db.components().insertPublicProject(organization, p -> p.setDbKey("project1"));
     authorizationIndexerTester.allowOnlyAnyone(project1);
-    ComponentDto project2 = db.components().insertPublicProject(organization, p -> p.setKey("project2"));
+    ComponentDto project2 = db.components().insertPublicProject(organization, p -> p.setDbKey("project2"));
     db.components().insertSnapshot(project2, snapshot -> snapshot.setCreatedAt(40_000_000_000L).setLast(true));
     authorizationIndexerTester.allowOnlyAnyone(project2);
-    ComponentDto project3 = db.components().insertPublicProject(organization, p -> p.setKey("project3"));
+    ComponentDto project3 = db.components().insertPublicProject(organization, p -> p.setDbKey("project3"));
     db.components().insertSnapshot(project3, snapshot -> snapshot.setCreatedAt(20_000_000_000L).setLast(true));
     authorizationIndexerTester.allowOnlyAnyone(project3);
-    ComponentDto project4 = db.components().insertPublicProject(organization, p -> p.setKey("project4"));
+    ComponentDto project4 = db.components().insertPublicProject(organization, p -> p.setDbKey("project4"));
     db.components().insertSnapshot(project4, snapshot -> snapshot.setCreatedAt(10_000_000_000L).setLast(false));
     db.components().insertSnapshot(project4, snapshot -> snapshot.setCreatedAt(30_000_000_000L).setLast(true));
     authorizationIndexerTester.allowOnlyAnyone(project4);
     projectMeasuresIndexer.indexOnStartup(null);
 
     assertThat(call(request.setSort(ANALYSIS_DATE).setAsc(true)).getComponentsList()).extracting(Component::getKey)
-      .containsExactly(project3.getKey(), project4.getKey(), project2.getKey(), project1.getKey());
+      .containsExactly(project3.getDbKey(), project4.getDbKey(), project2.getDbKey(), project1.getDbKey());
 
     assertThat(call(request.setSort(ANALYSIS_DATE).setAsc(false)).getComponentsList()).extracting(Component::getKey)
-      .containsExactly(project2.getKey(), project4.getKey(), project3.getKey(), project1.getKey());
+      .containsExactly(project2.getDbKey(), project4.getDbKey(), project3.getDbKey(), project1.getDbKey());
   }
 
   @Test
@@ -1011,9 +1010,9 @@ public class SearchProjectsActionTest {
 
     assertThat(result.getComponentsList()).extracting(Component::getKey, Component::hasAnalysisDate, Component::getAnalysisDate)
       .containsOnly(
-        tuple(project1.getKey(), true, formatDateTime(new Date(20_000_000_000L))),
-        tuple(project2.getKey(), true, formatDateTime(new Date(30_000_000_000L))),
-        tuple(project3.getKey(), false, ""));
+        tuple(project1.getDbKey(), true, formatDateTime(new Date(20_000_000_000L))),
+        tuple(project2.getDbKey(), true, formatDateTime(new Date(30_000_000_000L))),
+        tuple(project3.getDbKey(), false, ""));
   }
 
   @Test
@@ -1036,9 +1035,9 @@ public class SearchProjectsActionTest {
 
     assertThat(result.getComponentsList()).extracting(Component::getKey, Component::hasLeakPeriodDate, Component::getLeakPeriodDate)
       .containsOnly(
-        tuple(project1.getKey(), true, formatDateTime(new Date(10_000_000_000L))),
-        tuple(project2.getKey(), false, ""),
-        tuple(project3.getKey(), false, ""));
+        tuple(project1.getDbKey(), true, formatDateTime(new Date(10_000_000_000L))),
+        tuple(project2.getDbKey(), false, ""),
+        tuple(project3.getDbKey(), false, ""));
   }
 
   @Test
@@ -1055,8 +1054,8 @@ public class SearchProjectsActionTest {
 
     assertThat(result.getComponentsList()).extracting(Component::getKey, Component::getVisibility)
       .containsExactly(
-        tuple(privateProject.getKey(), privateProject.isPrivate() ? "private" : "public"),
-        tuple(publicProject.getKey(), publicProject.isPrivate() ? "private" : "public"));
+        tuple(privateProject.getDbKey(), privateProject.isPrivate() ? "private" : "public"),
+        tuple(publicProject.getDbKey(), publicProject.isPrivate() ? "private" : "public"));
   }
 
   @Test

server/sonar-server/src/test/java/org/sonar/server/component/ws/ShowActionTest.java

@@ -151,10 +151,10 @@ public class ShowActionTest {
     ComponentDto file = db.components().insertComponent(newFileDto(directory));
     userSession.addProjectPermission(USER, project);
 
-    ShowWsResponse response = newRequest(null, file.key());
+    ShowWsResponse response = newRequest(null, file.getDbKey());
 
-    assertThat(response.getComponent().getKey()).isEqualTo(file.key());
-    assertThat(response.getAncestorsList()).extracting(WsComponents.Component::getKey).containsOnly(directory.key(), module.key(), project.key());
+    assertThat(response.getComponent().getKey()).isEqualTo(file.getDbKey());
+    assertThat(response.getAncestorsList()).extracting(WsComponents.Component::getKey).containsOnly(directory.getDbKey(), module.getDbKey(), project.getDbKey());
   }
 
   @Test
@@ -163,9 +163,9 @@ public class ShowActionTest {
     db.components().insertComponent(newModuleDto(project));
     userSession.addProjectPermission(USER, project);
 
-    ShowWsResponse response = newRequest(null, project.key());
+    ShowWsResponse response = newRequest(null, project.getDbKey());
 
-    assertThat(response.getComponent().getKey()).isEqualTo(project.key());
+    assertThat(response.getComponent().getKey()).isEqualTo(project.getDbKey());
     assertThat(response.getAncestorsList()).isEmpty();
   }
 
@@ -178,7 +178,7 @@ public class ShowActionTest {
       newAnalysis(project).setCreatedAt(3_000_000_000L).setLast(true));
     userSession.addProjectPermission(USER, project);
 
-    ShowWsResponse response = newRequest(null, project.key());
+    ShowWsResponse response = newRequest(null, project.getDbKey());
 
     assertThat(response.getComponent().getAnalysisDate()).isNotEmpty().isEqualTo(formatDateTime(new Date(3_000_000_000L)));
   }
@@ -193,7 +193,7 @@ public class ShowActionTest {
 
     userSession.addProjectPermission(USER, project);
 
-    ShowWsResponse response = newRequest(null, project.key());
+    ShowWsResponse response = newRequest(null, project.getDbKey());
 
     assertThat(response.getComponent().getLeakPeriodDate()).isNotEmpty().isEqualTo(formatDateTime(new Date(3_000_000_000L)));
   }
@@ -207,7 +207,7 @@ public class ShowActionTest {
     ComponentDto file = db.components().insertComponent(newFileDto(directory));
     userSession.addProjectPermission(USER, project);
 
-    ShowWsResponse response = newRequest(null, file.key());
+    ShowWsResponse response = newRequest(null, file.getDbKey());
 
     String expectedDate = formatDateTime(new Date(3_000_000_000L));
     assertThat(response.getAncestorsList()).extracting(WsComponents.Component::getAnalysisDate)
@@ -219,7 +219,7 @@ public class ShowActionTest {
     userSession.logIn().setRoot();
     ComponentDto privateProject = db.components().insertPrivateProject();
 
-    ShowWsResponse result = newRequest(null, privateProject.key());
+    ShowWsResponse result = newRequest(null, privateProject.getDbKey());
     assertThat(result.getComponent().hasVisibility()).isTrue();
     assertThat(result.getComponent().getVisibility()).isEqualTo("private");
   }
@@ -229,7 +229,7 @@ public class ShowActionTest {
     userSession.logIn().setRoot();
     ComponentDto publicProject = db.components().insertPublicProject();
 
-    ShowWsResponse result = newRequest(null, publicProject.key());
+    ShowWsResponse result = newRequest(null, publicProject.getDbKey());
     assertThat(result.getComponent().hasVisibility()).isTrue();
     assertThat(result.getComponent().getVisibility()).isEqualTo("public");
   }
@@ -239,7 +239,7 @@ public class ShowActionTest {
     userSession.logIn().setRoot();
     ComponentDto view = db.components().insertView();
 
-    ShowWsResponse result = newRequest(null, view.key());
+    ShowWsResponse result = newRequest(null, view.getDbKey());
     assertThat(result.getComponent().hasVisibility()).isTrue();
   }
 
@@ -249,7 +249,7 @@ public class ShowActionTest {
     ComponentDto privateProject = db.components().insertPrivateProject();
     ComponentDto module = db.components().insertComponent(newModuleDto(privateProject));
 
-    ShowWsResponse result = newRequest(null, module.key());
+    ShowWsResponse result = newRequest(null, module.getDbKey());
     assertThat(result.getComponent().hasVisibility()).isFalse();
   }
 
@@ -275,7 +275,7 @@ public class ShowActionTest {
   public void fail_if_component_is_removed() {
     userSession.logIn().setRoot();
     ComponentDto project = db.components().insertComponent(newPrivateProjectDto(db.getDefaultOrganization()));
-    db.components().insertComponent(newFileDto(project).setKey("file-key").setEnabled(false));
+    db.components().insertComponent(newFileDto(project).setDbKey("file-key").setEnabled(false));
 
     expectedException.expect(NotFoundException.class);
     expectedException.expectMessage("Component key 'file-key' not found");
@@ -297,7 +297,7 @@ public class ShowActionTest {
   private void insertJsonExampleComponentsAndSnapshots() {
     OrganizationDto organizationDto = db.organizations().insertForKey("my-org-1");
     ComponentDto project = db.components().insertComponent(newPrivateProjectDto(organizationDto, "AVIF98jgA3Ax6PH2efOW")
-      .setKey("com.sonarsource:java-markdown")
+      .setDbKey("com.sonarsource:java-markdown")
       .setName("Java Markdown")
       .setDescription("Java Markdown Project")
       .setQualifier(Qualifiers.PROJECT)
@@ -306,13 +306,13 @@ public class ShowActionTest {
       .setCreatedAt(parseDateTime("2017-03-01T11:39:03+0100").getTime())
       .setPeriodDate(parseDateTime("2017-01-01T11:39:03+0100").getTime()));
     ComponentDto directory = newDirectory(project, "AVIF-FfgA3Ax6PH2efPF", "src/main/java/com/sonarsource/markdown/impl")
-      .setKey("com.sonarsource:java-markdown:src/main/java/com/sonarsource/markdown/impl")
+      .setDbKey("com.sonarsource:java-markdown:src/main/java/com/sonarsource/markdown/impl")
       .setName("src/main/java/com/sonarsource/markdown/impl")
       .setQualifier(Qualifiers.DIRECTORY);
     db.components().insertComponent(directory);
     db.components().insertComponent(
       newFileDto(directory, directory, "AVIF-FffA3Ax6PH2efPD")
-        .setKey("com.sonarsource:java-markdown:src/main/java/com/sonarsource/markdown/impl/Rule.java")
+        .setDbKey("com.sonarsource:java-markdown:src/main/java/com/sonarsource/markdown/impl/Rule.java")
         .setName("Rule.java")
         .setPath("src/main/java/com/sonarsource/markdown/impl/Rule.java")
         .setLanguage("java")

server/sonar-server/src/test/java/org/sonar/server/component/ws/SuggestionsActionTest.java

@@ -140,15 +140,15 @@ public class SuggestionsActionTest {
   @Test
   public void test_example_json_response() {
     OrganizationDto organization = db.organizations().insert(o -> o.setKey("default-organization").setName("Default Organization"));
-    ComponentDto project1 = db.components().insertPublicProject(organization, p -> p.setKey("org.sonarsource:sonarqube").setName("SonarSource :: SonarQube"));
-    ComponentDto project2 = db.components().insertPublicProject(organization, p -> p.setKey("org.sonarsource:sonarlint").setName("SonarSource :: SonarLint"));
+    ComponentDto project1 = db.components().insertPublicProject(organization, p -> p.setDbKey("org.sonarsource:sonarqube").setName("SonarSource :: SonarQube"));
+    ComponentDto project2 = db.components().insertPublicProject(organization, p -> p.setDbKey("org.sonarsource:sonarlint").setName("SonarSource :: SonarLint"));
     componentIndexer.indexOnStartup(null);
     authorizationIndexerTester.allowOnlyAnyone(project1);
     authorizationIndexerTester.allowOnlyAnyone(project2);
 
     TestResponse wsResponse = ws.newRequest()
       .setParam(PARAM_QUERY, "Sonar")
-      .setParam(PARAM_RECENTLY_BROWSED, project1.key())
+      .setParam(PARAM_RECENTLY_BROWSED, project1.getDbKey())
       .setMethod("POST")
       .setMediaType(MediaTypes.JSON)
       .execute();
@@ -165,7 +165,7 @@ public class SuggestionsActionTest {
 
     SuggestionsWsResponse response = ws.newRequest()
       .setMethod("POST")
-      .setParam(PARAM_RECENTLY_BROWSED, project.getKey())
+      .setParam(PARAM_RECENTLY_BROWSED, project.getDbKey())
       .executeProtobuf(SuggestionsWsResponse.class);
 
     // assert match in qualifier "TRK"
@@ -178,7 +178,7 @@ public class SuggestionsActionTest {
     assertThat(response.getResultsList())
       .flatExtracting(Category::getItemsList)
       .extracting(Suggestion::getKey, Suggestion::getIsRecentlyBrowsed)
-      .containsExactly(tuple(project.getKey(), true));
+      .containsExactly(tuple(project.getDbKey(), true));
   }
 
   @Test
@@ -189,7 +189,7 @@ public class SuggestionsActionTest {
 
     SuggestionsWsResponse response = ws.newRequest()
       .setMethod("POST")
-      .setParam(PARAM_RECENTLY_BROWSED, project.getKey())
+      .setParam(PARAM_RECENTLY_BROWSED, project.getDbKey())
       .executeProtobuf(SuggestionsWsResponse.class);
 
     // assert match in qualifier "TRK"
@@ -202,7 +202,7 @@ public class SuggestionsActionTest {
     assertThat(response.getResultsList())
       .flatExtracting(Category::getItemsList)
       .extracting(Suggestion::getKey, Suggestion::getIsRecentlyBrowsed)
-      .containsExactly(tuple(project.getKey(), true));
+      .containsExactly(tuple(project.getDbKey(), true));
   }
 
   @Test
@@ -213,7 +213,7 @@ public class SuggestionsActionTest {
 
     SuggestionsWsResponse response = ws.newRequest()
       .setMethod("POST")
-      .setParam(PARAM_RECENTLY_BROWSED, project.getKey())
+      .setParam(PARAM_RECENTLY_BROWSED, project.getDbKey())
       .executeProtobuf(SuggestionsWsResponse.class);
 
     assertThat(response.getResultsList())
@@ -243,7 +243,7 @@ public class SuggestionsActionTest {
     assertThat(response.getResultsList())
       .flatExtracting(Category::getItemsList)
       .extracting(Suggestion::getKey, Suggestion::getIsFavorite)
-      .containsExactly(tuple(project.getKey(), true));
+      .containsExactly(tuple(project.getDbKey(), true));
   }
 
   @Test
@@ -272,7 +272,7 @@ public class SuggestionsActionTest {
 
     SuggestionsWsResponse response = ws.newRequest()
       .setMethod("POST")
-      .setParam(PARAM_RECENTLY_BROWSED, project.key())
+      .setParam(PARAM_RECENTLY_BROWSED, project.getDbKey())
       .executeProtobuf(SuggestionsWsResponse.class);
 
     // assert match in qualifier "TRK"
@@ -285,7 +285,7 @@ public class SuggestionsActionTest {
     assertThat(response.getResultsList())
       .flatExtracting(Category::getItemsList)
       .extracting(Suggestion::getKey, Suggestion::getIsFavorite, Suggestion::getIsRecentlyBrowsed)
-      .containsExactly(tuple(project.getKey(), true, true));
+      .containsExactly(tuple(project.getDbKey(), true, true));
   }
 
   @Test
@@ -322,7 +322,7 @@ public class SuggestionsActionTest {
 
     SuggestionsWsResponse response = ws.newRequest()
       .setMethod("POST")
-      .setParam(PARAM_RECENTLY_BROWSED, Stream.of(project3, project1).map(ComponentDto::getKey).collect(joining(",")))
+      .setParam(PARAM_RECENTLY_BROWSED, Stream.of(project3, project1).map(ComponentDto::getDbKey).collect(joining(",")))
       .executeProtobuf(SuggestionsWsResponse.class);
 
     // assert order of keys
@@ -344,7 +344,7 @@ public class SuggestionsActionTest {
 
     SuggestionsWsResponse response = ws.newRequest()
       .setMethod("POST")
-      .setParam(PARAM_RECENTLY_BROWSED, project.key())
+      .setParam(PARAM_RECENTLY_BROWSED, project.getDbKey())
       .executeProtobuf(SuggestionsWsResponse.class);
 
     assertThat(response.getResultsList())
@@ -361,7 +361,7 @@ public class SuggestionsActionTest {
 
     SuggestionsWsResponse response = ws.newRequest()
       .setMethod("POST")
-      .setParam(PARAM_RECENTLY_BROWSED, project.key())
+      .setParam(PARAM_RECENTLY_BROWSED, project.getDbKey())
       .executeProtobuf(SuggestionsWsResponse.class);
 
     assertThat(response.getResultsList())
@@ -378,7 +378,7 @@ public class SuggestionsActionTest {
 
     SuggestionsWsResponse response = ws.newRequest()
       .setMethod("POST")
-      .setParam(PARAM_QUERY, project.getKey())
+      .setParam(PARAM_QUERY, project.getDbKey())
       .executeProtobuf(SuggestionsWsResponse.class);
 
     // assert match in qualifier "TRK"
@@ -391,7 +391,7 @@ public class SuggestionsActionTest {
     assertThat(response.getResultsList())
       .flatExtracting(Category::getItemsList)
       .extracting(Suggestion::getKey, Suggestion::getOrganization)
-      .containsExactly(tuple(project.getKey(), organization.getKey()));
+      .containsExactly(tuple(project.getDbKey(), organization.getKey()));
   }
 
   @Test
@@ -435,7 +435,7 @@ public class SuggestionsActionTest {
     assertThat(response.getResultsList())
       .flatExtracting(Category::getItemsList)
       .extracting(Suggestion::getKey)
-      .contains(project.getKey());
+      .contains(project.getDbKey());
     assertThat(response.getWarning()).contains(SHORT_INPUT_WARNING);
   }
 
@@ -455,7 +455,7 @@ public class SuggestionsActionTest {
     assertThat(response.getResultsList())
       .flatExtracting(Category::getItemsList)
       .extracting(Suggestion::getKey, Suggestion::getName)
-      .containsExactlyInAnyOrder(tuple(project1.getKey(), project1.name()));
+      .containsExactlyInAnyOrder(tuple(project1.getDbKey(), project1.name()));
   }
 
   @Test
@@ -499,12 +499,12 @@ public class SuggestionsActionTest {
     assertThat(response.getResultsList())
       .flatExtracting(Category::getItemsList)
       .extracting(Suggestion::getProject)
-      .containsOnly(project.key());
+      .containsOnly(project.getDbKey());
 
     assertThat(response.getProjectsList())
       .extracting(Project::getKey, Project::getName)
       .containsExactlyInAnyOrder(
-        tuple(project.key(), project.longName()));
+        tuple(project.getDbKey(), project.longName()));
   }
 
   @Test
@@ -520,7 +520,7 @@ public class SuggestionsActionTest {
     SuggestionsWsResponse response = ws.newRequest()
       .setMethod("POST")
       .setParam(PARAM_QUERY, "Module")
-      .setParam(PARAM_RECENTLY_BROWSED, Stream.of(module1.getKey()).collect(joining(",")))
+      .setParam(PARAM_RECENTLY_BROWSED, Stream.of(module1.getDbKey()).collect(joining(",")))
       .executeProtobuf(SuggestionsWsResponse.class);
 
     assertThat(response.getResultsList())
@@ -549,7 +549,7 @@ public class SuggestionsActionTest {
     assertThat(response.getResultsList())
       .flatExtracting(Category::getItemsList)
       .extracting(Suggestion::getKey, Suggestion::getIsFavorite)
-      .containsExactly(tuple(favorite.getKey(), true), tuple(nonFavorite.getKey(), false));
+      .containsExactly(tuple(favorite.getDbKey(), true), tuple(nonFavorite.getDbKey(), false));
   }
 
   @Test

server/sonar-server/src/test/java/org/sonar/server/component/ws/TreeActionTest.java

@@ -231,7 +231,7 @@ public class TreeActionTest {
     OrganizationDto organizationDto = db.organizations().insert();
     ComponentDto view = newView(organizationDto, "view-uuid");
     componentDb.insertViewAndSnapshot(view);
-    ComponentDto project = newPrivateProjectDto(organizationDto, "project-uuid-1").setName("project-name").setKey("project-key-1");
+    ComponentDto project = newPrivateProjectDto(organizationDto, "project-uuid-1").setName("project-name").setDbKey("project-key-1");
     componentDb.insertProjectAndSnapshot(project);
     componentDb.insertComponent(newProjectCopy("project-uuid-1-copy", project, view));
     componentDb.insertComponent(newSubView(view, "sub-view-uuid", "sub-view-key").setName("sub-view-name"));
@@ -358,7 +358,7 @@ public class TreeActionTest {
   @Test
   public void fail_when_base_component_is_removed() {
     ComponentDto project = componentDb.insertComponent(newPrivateProjectDto(db.getDefaultOrganization()));
-    componentDb.insertComponent(ComponentTesting.newFileDto(project).setKey("file-key").setEnabled(false));
+    componentDb.insertComponent(ComponentTesting.newFileDto(project).setDbKey("file-key").setEnabled(false));
     logInWithBrowsePermission(project);
 
     expectedException.expect(NotFoundException.class);
@@ -380,7 +380,7 @@ public class TreeActionTest {
   private static ComponentDto newFileDto(ComponentDto moduleOrProject, @Nullable ComponentDto directory, int i) {
     return ComponentTesting.newFileDto(moduleOrProject, directory, "file-uuid-" + i)
       .setName("file-name-" + i)
-      .setKey("file-key-" + i)
+      .setDbKey("file-key-" + i)
       .setPath("file-path-" + i);
   }
 
@@ -391,7 +391,7 @@ public class TreeActionTest {
   private ComponentDto initJsonExampleComponents() throws IOException {
     OrganizationDto organizationDto = db.organizations().insertForKey("my-org-1");
     ComponentDto project = newPrivateProjectDto(organizationDto, "MY_PROJECT_ID")
-      .setKey("MY_PROJECT_KEY")
+      .setDbKey("MY_PROJECT_KEY")
       .setName("Project Name");
     componentDb.insertProjectAndSnapshot(project);
     Date now = new Date();
@@ -402,7 +402,7 @@ public class TreeActionTest {
       JsonObject componentAsJsonObject = componentAsJsonElement.getAsJsonObject();
       String uuid = getJsonField(componentAsJsonObject, "id");
       componentDb.insertComponent(newChildComponent(uuid, project, project)
-        .setKey(getJsonField(componentAsJsonObject, "key"))
+        .setDbKey(getJsonField(componentAsJsonObject, "key"))
         .setName(getJsonField(componentAsJsonObject, "name"))
         .setLanguage(getJsonField(componentAsJsonObject, "language"))
         .setPath(getJsonField(componentAsJsonObject, "path"))

server/sonar-server/src/test/java/org/sonar/server/computation/queue/ReportSubmitterTest.java

@@ -106,7 +106,7 @@ public class ReportSubmitterTest {
     ComponentDto project = db.components().insertPrivateProject(organization);
     mockSuccessfulPrepareSubmitCall();
 
-    underTest.submit(organization.getKey(), project.getKey(), null, project.name(), IOUtils.toInputStream("{binary}"));
+    underTest.submit(organization.getKey(), project.getDbKey(), null, project.name(), IOUtils.toInputStream("{binary}"));
   }
 
   @Test
@@ -116,7 +116,7 @@ public class ReportSubmitterTest {
 
     mockSuccessfulPrepareSubmitCall();
 
-    underTest.submit(defaultOrganizationKey, project.getKey(), null, project.name(), IOUtils.toInputStream("{binary}"));
+    underTest.submit(defaultOrganizationKey, project.getDbKey(), null, project.name(), IOUtils.toInputStream("{binary}"));
 
     verifyReportIsPersisted(TASK_UUID);
     verifyZeroInteractions(permissionTemplateService);
@@ -143,7 +143,7 @@ public class ReportSubmitterTest {
       .addPermission(PROVISION_PROJECTS, organization);
 
     mockSuccessfulPrepareSubmitCall();
-    ComponentDto createdProject = newPrivateProjectDto(organization, PROJECT_UUID).setKey(PROJECT_KEY);
+    ComponentDto createdProject = newPrivateProjectDto(organization, PROJECT_UUID).setDbKey(PROJECT_KEY);
     when(componentUpdater.create(any(DbSession.class), any(NewComponent.class), eq(null))).thenReturn(createdProject);
     when(permissionTemplateService.wouldUserHaveScanPermissionWithDefaultTemplate(any(DbSession.class), eq(organization.getUuid()), anyInt(), anyString(),
       eq(PROJECT_KEY), eq(Qualifiers.PROJECT)))
@@ -174,7 +174,7 @@ public class ReportSubmitterTest {
       .addPermission(PROVISION_PROJECTS, db.getDefaultOrganization());
 
     mockSuccessfulPrepareSubmitCall();
-    ComponentDto createdProject = newPrivateProjectDto(db.getDefaultOrganization(), PROJECT_UUID).setKey(PROJECT_KEY);
+    ComponentDto createdProject = newPrivateProjectDto(db.getDefaultOrganization(), PROJECT_UUID).setDbKey(PROJECT_KEY);
     when(componentUpdater.create(any(DbSession.class), any(NewComponent.class), eq(null))).thenReturn(createdProject);
     when(permissionTemplateService.wouldUserHaveScanPermissionWithDefaultTemplate(any(DbSession.class), eq(defaultOrganizationUuid), anyInt(), anyString(),
       eq(PROJECT_KEY), eq(Qualifiers.PROJECT)))
@@ -193,7 +193,7 @@ public class ReportSubmitterTest {
       .addPermission(PROVISION_PROJECTS, db.getDefaultOrganization());
 
     mockSuccessfulPrepareSubmitCall();
-    ComponentDto project = newPrivateProjectDto(db.getDefaultOrganization(), PROJECT_UUID).setKey(PROJECT_KEY);
+    ComponentDto project = newPrivateProjectDto(db.getDefaultOrganization(), PROJECT_UUID).setDbKey(PROJECT_KEY);
     when(componentUpdater.create(any(DbSession.class), any(NewComponent.class), eq(null))).thenReturn(project);
     when(permissionTemplateService.wouldUserHaveScanPermissionWithDefaultTemplate(any(DbSession.class), eq(defaultOrganizationUuid), anyInt(), anyString(),
       eq(PROJECT_KEY), eq(Qualifiers.PROJECT)))
@@ -212,7 +212,7 @@ public class ReportSubmitterTest {
 
     mockSuccessfulPrepareSubmitCall();
 
-    underTest.submit(org.getKey(), project.getKey(), null, project.name(), IOUtils.toInputStream("{binary}"));
+    underTest.submit(org.getKey(), project.getDbKey(), null, project.name(), IOUtils.toInputStream("{binary}"));
 
     verify(queue).submit(any(CeTaskSubmit.class));
   }
@@ -224,7 +224,7 @@ public class ReportSubmitterTest {
 
     mockSuccessfulPrepareSubmitCall();
 
-    underTest.submit(defaultOrganizationKey, project.getKey(), null, project.name(), IOUtils.toInputStream("{binary}"));
+    underTest.submit(defaultOrganizationKey, project.getDbKey(), null, project.name(), IOUtils.toInputStream("{binary}"));
 
     verify(queue).submit(any(CeTaskSubmit.class));
   }
@@ -241,7 +241,7 @@ public class ReportSubmitterTest {
     userSession.addProjectPermission(SCAN_EXECUTION, ComponentTesting.newPrivateProjectDto(db.getDefaultOrganization(), PROJECT_UUID));
 
     mockSuccessfulPrepareSubmitCall();
-    when(componentUpdater.create(any(DbSession.class), any(NewComponent.class), eq(null))).thenReturn(new ComponentDto().setUuid(PROJECT_UUID).setKey(PROJECT_KEY));
+    when(componentUpdater.create(any(DbSession.class), any(NewComponent.class), eq(null))).thenReturn(new ComponentDto().setUuid(PROJECT_UUID).setDbKey(PROJECT_KEY));
 
     thrown.expect(ForbiddenException.class);
     underTest.submit(defaultOrganizationKey, PROJECT_KEY, null, PROJECT_NAME, IOUtils.toInputStream("{binary}"));
@@ -257,10 +257,10 @@ public class ReportSubmitterTest {
 
     // user does not have the "scan" permission on the branch, so it can't scan it
     String branchName = "branchFoo";
-    ComponentDto branchProject = db.components().insertPrivateProject(p -> p.setKey(mainProject.getKey() + ":" + branchName));
+    ComponentDto branchProject = db.components().insertPrivateProject(p -> p.setDbKey(mainProject.getDbKey() + ":" + branchName));
 
     thrown.expect(ForbiddenException.class);
-    underTest.submit(defaultOrganizationKey, mainProject.key(), branchName, PROJECT_NAME, IOUtils.toInputStream("{binary}"));
+    underTest.submit(defaultOrganizationKey, mainProject.getDbKey(), branchName, PROJECT_NAME, IOUtils.toInputStream("{binary}"));
   }
 
   private void verifyReportIsPersisted(String taskUuid) {

server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ConfigurationRepositoryTest.java

@@ -75,7 +75,7 @@ public class ConfigurationRepositoryTest {
 
   @Test
   public void get_project_settings_from_db() {
-    ComponentDto project = ComponentTesting.newPrivateProjectDto(dbTester.organizations().insert()).setKey(ROOT.getKey());
+    ComponentDto project = ComponentTesting.newPrivateProjectDto(dbTester.organizations().insert()).setDbKey(ROOT.getKey());
     dbClient.componentDao().insert(session, project);
     dbClient.propertiesDao().saveProperty(session, new PropertyDto().setResourceId(project.getId()).setKey("key").setValue("value"));
     session.commit();

server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest.java

@@ -323,7 +323,7 @@ public class FileMoveDetectionStepTest {
     assertThat(movedFilesRepository.getComponentsWithOriginal()).containsExactly(FILE_2);
     MovedFilesRepository.OriginalFile originalFile = movedFilesRepository.getOriginalFile(FILE_2).get();
     assertThat(originalFile.getId()).isEqualTo(dtos[0].getId());
-    assertThat(originalFile.getKey()).isEqualTo(dtos[0].getKey());
+    assertThat(originalFile.getKey()).isEqualTo(dtos[0].getDbKey());
     assertThat(originalFile.getUuid()).isEqualTo(dtos[0].uuid());
   }
 
@@ -446,11 +446,11 @@ public class FileMoveDetectionStepTest {
     assertThat(movedFilesRepository.getComponentsWithOriginal()).containsOnly(FILE_3, file6);
     MovedFilesRepository.OriginalFile originalFile2 = movedFilesRepository.getOriginalFile(FILE_3).get();
     assertThat(originalFile2.getId()).isEqualTo(dtos[0].getId());
-    assertThat(originalFile2.getKey()).isEqualTo(dtos[0].getKey());
+    assertThat(originalFile2.getKey()).isEqualTo(dtos[0].getDbKey());
     assertThat(originalFile2.getUuid()).isEqualTo(dtos[0].uuid());
     MovedFilesRepository.OriginalFile originalFile5 = movedFilesRepository.getOriginalFile(file6).get();
     assertThat(originalFile5.getId()).isEqualTo(dtos[3].getId());
-    assertThat(originalFile5.getKey()).isEqualTo(dtos[3].getKey());
+    assertThat(originalFile5.getKey()).isEqualTo(dtos[3].getDbKey());
     assertThat(originalFile5.getUuid()).isEqualTo(dtos[3].uuid());
   }
 
@@ -541,7 +541,7 @@ public class FileMoveDetectionStepTest {
     ComponentDto res = new ComponentDto();
     res
       .setId(dbIdGenerator)
-      .setKey(key)
+      .setDbKey(key)
       .setUuid(componentUuidOf(key))
       .setPath("path_" + key);
     dbIdGenerator++;

server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/IntegrateIssuesVisitorTest.java

@@ -276,8 +276,8 @@ public class IntegrateIssuesVisitorTest {
   }
 
   private void addBaseIssue(RuleKey ruleKey) {
-    ComponentDto project = ComponentTesting.newPrivateProjectDto(dbTester.organizations().insert(), PROJECT_UUID).setKey(PROJECT_KEY);
-    ComponentDto file = ComponentTesting.newFileDto(project, null, FILE_UUID).setKey(FILE_KEY);
+    ComponentDto project = ComponentTesting.newPrivateProjectDto(dbTester.organizations().insert(), PROJECT_UUID).setDbKey(PROJECT_KEY);
+    ComponentDto file = ComponentTesting.newFileDto(project, null, FILE_UUID).setDbKey(FILE_KEY);
     dbTester.getDbClient().componentDao().insert(dbTester.getSession(), project, file);
 
     RuleDto ruleDto = RuleTesting.newDto(ruleKey);

server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/BuildComponentTreeStepTest.java

@@ -170,11 +170,11 @@ public class BuildComponentTreeStepTest {
   @Test
   public void return_existing_uuids() {
     OrganizationDto organizationDto = dbTester.organizations().insert();
-    ComponentDto project = insertComponent(newPrivateProjectDto(organizationDto, "ABCD").setKey(REPORT_PROJECT_KEY));
-    ComponentDto module = insertComponent(newModuleDto("BCDE", project).setKey(REPORT_MODULE_KEY));
+    ComponentDto project = insertComponent(newPrivateProjectDto(organizationDto, "ABCD").setDbKey(REPORT_PROJECT_KEY));
+    ComponentDto module = insertComponent(newModuleDto("BCDE", project).setDbKey(REPORT_MODULE_KEY));
     ComponentDto directory = newDirectory(module, "CDEF", REPORT_DIR_KEY_1);
-    insertComponent(directory.setKey(REPORT_MODULE_KEY + ":" + REPORT_DIR_KEY_1));
-    insertComponent(newFileDto(module, directory, "DEFG").setKey(REPORT_MODULE_KEY + ":" + REPORT_FILE_KEY_1));
+    insertComponent(directory.setDbKey(REPORT_MODULE_KEY + ":" + REPORT_DIR_KEY_1));
+    insertComponent(newFileDto(module, directory, "DEFG").setDbKey(REPORT_MODULE_KEY + ":" + REPORT_FILE_KEY_1));
 
     reportReader.putComponent(componentWithKey(ROOT_REF, PROJECT, REPORT_PROJECT_KEY, MODULE_REF));
     reportReader.putComponent(componentWithKey(MODULE_REF, MODULE, REPORT_MODULE_KEY, DIR_REF_1));
@@ -250,10 +250,10 @@ public class BuildComponentTreeStepTest {
   @Test
   public void return_existing_uuids_when_components_were_removed() {
     OrganizationDto organizationDto = dbTester.organizations().insert();
-    ComponentDto project = insertComponent(newPrivateProjectDto(organizationDto, "ABCD").setKey(REPORT_PROJECT_KEY));
-    ComponentDto removedModule = insertComponent(newModuleDto("BCDE", project).setKey(REPORT_MODULE_KEY).setEnabled(false));
-    ComponentDto removedDirectory = insertComponent(newDirectory(removedModule, "CDEF", REPORT_DIR_KEY_1).setKey(REPORT_MODULE_KEY + ":" + REPORT_DIR_KEY_1).setEnabled(false));
-    insertComponent(newFileDto(removedModule, removedDirectory, "DEFG").setKey(REPORT_MODULE_KEY + ":" + REPORT_FILE_KEY_1).setEnabled(false));
+    ComponentDto project = insertComponent(newPrivateProjectDto(organizationDto, "ABCD").setDbKey(REPORT_PROJECT_KEY));
+    ComponentDto removedModule = insertComponent(newModuleDto("BCDE", project).setDbKey(REPORT_MODULE_KEY).setEnabled(false));
+    ComponentDto removedDirectory = insertComponent(newDirectory(removedModule, "CDEF", REPORT_DIR_KEY_1).setDbKey(REPORT_MODULE_KEY + ":" + REPORT_DIR_KEY_1).setEnabled(false));
+    insertComponent(newFileDto(removedModule, removedDirectory, "DEFG").setDbKey(REPORT_MODULE_KEY + ":" + REPORT_FILE_KEY_1).setEnabled(false));
 
     reportReader.putComponent(componentWithKey(ROOT_REF, PROJECT, REPORT_PROJECT_KEY, MODULE_REF));
     reportReader.putComponent(componentWithKey(MODULE_REF, MODULE, REPORT_MODULE_KEY, DIR_REF_1));
@@ -281,7 +281,7 @@ public class BuildComponentTreeStepTest {
   @Test
   public void set_no_base_project_snapshot_when_no_last_snapshot() throws Exception {
     OrganizationDto organizationDto = dbTester.organizations().insert();
-    ComponentDto project = insertComponent(newPrivateProjectDto(organizationDto, "ABCD").setKey(REPORT_PROJECT_KEY));
+    ComponentDto project = insertComponent(newPrivateProjectDto(organizationDto, "ABCD").setDbKey(REPORT_PROJECT_KEY));
     insertSnapshot(newAnalysis(project).setLast(false));
 
     reportReader.putComponent(componentWithKey(ROOT_REF, PROJECT, REPORT_PROJECT_KEY));
@@ -293,7 +293,7 @@ public class BuildComponentTreeStepTest {
   @Test
   public void set_base_project_snapshot_when_last_snapshot_exist() throws Exception {
     OrganizationDto organizationDto = dbTester.organizations().insert();
-    ComponentDto project = insertComponent(newPrivateProjectDto(organizationDto, "ABCD").setKey(REPORT_PROJECT_KEY));
+    ComponentDto project = insertComponent(newPrivateProjectDto(organizationDto, "ABCD").setDbKey(REPORT_PROJECT_KEY));
     insertSnapshot(newAnalysis(project).setLast(true));
 
     reportReader.putComponent(componentWithKey(ROOT_REF, PROJECT, REPORT_PROJECT_KEY));

server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/LoadCrossProjectDuplicationsRepositoryStepTest.java

@@ -164,7 +164,7 @@ public class LoadCrossProjectDuplicationsRepositoryStepTest {
           .build()),
       Arrays.asList(
         new Block.Builder()
-          .setResourceId(otherFile.getKey())
+          .setResourceId(otherFile.getDbKey())
           .setBlockHash(new ByteArray(hash))
           .setIndexInFile(duplicate.getIndexInFile())
           .setLines(duplicate.getStartLine(), duplicate.getEndLine())
@@ -245,14 +245,14 @@ public class LoadCrossProjectDuplicationsRepositoryStepTest {
     Map<Integer, Block> duplicationBlocksByIndex = blocksByIndexInFile(duplicationBlocks.getValue());
     assertThat(duplicationBlocksByIndex.get(0)).isEqualTo(
       new Block.Builder()
-        .setResourceId(otherFile.getKey())
+        .setResourceId(otherFile.getDbKey())
         .setBlockHash(new ByteArray(originBlock1.getHash()))
         .setIndexInFile(duplicate1.getIndexInFile())
         .setLines(duplicate1.getStartLine(), duplicate1.getEndLine())
         .build());
     assertThat(duplicationBlocksByIndex.get(1)).isEqualTo(
       new Block.Builder()
-        .setResourceId(otherFile.getKey())
+        .setResourceId(otherFile.getDbKey())
         .setBlockHash(new ByteArray(originBlock2.getHash()))
         .setIndexInFile(duplicate2.getIndexInFile())
         .setLines(duplicate2.getStartLine(), duplicate2.getEndLine())
@@ -326,7 +326,7 @@ public class LoadCrossProjectDuplicationsRepositoryStepTest {
   }
 
   private ComponentDto createProject(String projectKey) {
-    ComponentDto project = ComponentTesting.newPrivateProjectDto(dbTester.organizations().insert()).setKey(projectKey);
+    ComponentDto project = ComponentTesting.newPrivateProjectDto(dbTester.organizations().insert()).setDbKey(projectKey);
     dbClient.componentDao().insert(dbSession, project);
     dbSession.commit();
     return project;
@@ -341,7 +341,7 @@ public class LoadCrossProjectDuplicationsRepositoryStepTest {
 
   private ComponentDto createFile(String fileKey, ComponentDto project) {
     ComponentDto file = ComponentTesting.newFileDto(project, null)
-      .setKey(fileKey)
+      .setDbKey(fileKey)
       .setLanguage(XOO_LANGUAGE);
     dbClient.componentDao().insert(dbSession, file);
     dbSession.commit();

server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistMeasuresStepTest.java

@@ -382,7 +382,7 @@ public class PersistMeasuresStepTest extends BaseStepTest {
   private ComponentDto addComponent(String key, String uuid) {
     ComponentDto componentDto = new ComponentDto()
       .setOrganizationUuid("org1")
-      .setKey(key)
+      .setDbKey(key)
       .setUuid(uuid)
       .setUuidPath(uuid + ".")
       .setRootUuid(uuid)

server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportPersistAnalysisStepTest.java

@@ -99,13 +99,13 @@ public class ReportPersistAnalysisStepTest extends BaseStepTest {
   @Test
   public void persist_analysis() {
     OrganizationDto organizationDto = dbTester.organizations().insert();
-    ComponentDto projectDto = ComponentTesting.newPrivateProjectDto(organizationDto, "ABCD").setKey(PROJECT_KEY).setName("Project");
+    ComponentDto projectDto = ComponentTesting.newPrivateProjectDto(organizationDto, "ABCD").setDbKey(PROJECT_KEY).setName("Project");
     dbClient.componentDao().insert(dbTester.getSession(), projectDto);
-    ComponentDto moduleDto = ComponentTesting.newModuleDto("BCDE", projectDto).setKey("MODULE_KEY").setName("Module");
+    ComponentDto moduleDto = ComponentTesting.newModuleDto("BCDE", projectDto).setDbKey("MODULE_KEY").setName("Module");
     dbClient.componentDao().insert(dbTester.getSession(), moduleDto);
-    ComponentDto directoryDto = ComponentTesting.newDirectory(moduleDto, "CDEF", "MODULE_KEY:src/main/java/dir").setKey("MODULE_KEY:src/main/java/dir");
+    ComponentDto directoryDto = ComponentTesting.newDirectory(moduleDto, "CDEF", "MODULE_KEY:src/main/java/dir").setDbKey("MODULE_KEY:src/main/java/dir");
     dbClient.componentDao().insert(dbTester.getSession(), directoryDto);
-    ComponentDto fileDto = ComponentTesting.newFileDto(moduleDto, directoryDto, "DEFG").setKey("MODULE_KEY:src/main/java/dir/Foo.java");
+    ComponentDto fileDto = ComponentTesting.newFileDto(moduleDto, directoryDto, "DEFG").setDbKey("MODULE_KEY:src/main/java/dir/Foo.java");
     dbClient.componentDao().insert(dbTester.getSession(), fileDto);
     dbTester.getSession().commit();
 
@@ -141,7 +141,7 @@ public class ReportPersistAnalysisStepTest extends BaseStepTest {
   @Test
   public void persist_snapshots_with_leak_period() {
     OrganizationDto organizationDto = dbTester.organizations().insert();
-    ComponentDto projectDto = ComponentTesting.newPrivateProjectDto(organizationDto, "ABCD").setKey(PROJECT_KEY).setName("Project");
+    ComponentDto projectDto = ComponentTesting.newPrivateProjectDto(organizationDto, "ABCD").setDbKey(PROJECT_KEY).setName("Project");
     dbClient.componentDao().insert(dbTester.getSession(), projectDto);
     SnapshotDto snapshotDto = SnapshotTesting.newAnalysis(projectDto).setCreatedAt(DateUtils.parseDateQuietly("2015-01-01").getTime());
     dbClient.snapshotDao().insert(dbTester.getSession(), snapshotDto);
@@ -165,18 +165,18 @@ public class ReportPersistAnalysisStepTest extends BaseStepTest {
     periodsHolder.setPeriod(new Period(LEAK_PERIOD_MODE_PREVIOUS_ANALYSIS, null, analysisDate, "u1"));
 
     OrganizationDto organizationDto = dbTester.organizations().insert();
-    ComponentDto projectDto = ComponentTesting.newPrivateProjectDto(organizationDto, "ABCD").setKey(PROJECT_KEY).setName("Project");
+    ComponentDto projectDto = ComponentTesting.newPrivateProjectDto(organizationDto, "ABCD").setDbKey(PROJECT_KEY).setName("Project");
     dbClient.componentDao().insert(dbTester.getSession(), projectDto);
     SnapshotDto projectSnapshot = SnapshotTesting.newAnalysis(projectDto);
     dbClient.snapshotDao().insert(dbTester.getSession(), projectSnapshot);
 
-    ComponentDto moduleDto = ComponentTesting.newModuleDto("BCDE", projectDto).setKey("MODULE_KEY").setName("Module");
+    ComponentDto moduleDto = ComponentTesting.newModuleDto("BCDE", projectDto).setDbKey("MODULE_KEY").setName("Module");
     dbClient.componentDao().insert(dbTester.getSession(), moduleDto);
 
-    ComponentDto directoryDto = ComponentTesting.newDirectory(moduleDto, "CDEF", "MODULE_KEY:src/main/java/dir").setKey("MODULE_KEY:src/main/java/dir");
+    ComponentDto directoryDto = ComponentTesting.newDirectory(moduleDto, "CDEF", "MODULE_KEY:src/main/java/dir").setDbKey("MODULE_KEY:src/main/java/dir");
     dbClient.componentDao().insert(dbTester.getSession(), directoryDto);
 
-    ComponentDto fileDto = ComponentTesting.newFileDto(moduleDto, directoryDto, "DEFG").setKey("MODULE_KEY:src/main/java/dir/Foo.java");
+    ComponentDto fileDto = ComponentTesting.newFileDto(moduleDto, directoryDto, "DEFG").setDbKey("MODULE_KEY:src/main/java/dir/Foo.java");
     dbClient.componentDao().insert(dbTester.getSession(), fileDto);
 
     dbTester.getSession().commit();
@@ -200,7 +200,7 @@ public class ReportPersistAnalysisStepTest extends BaseStepTest {
 
   @Test
   public void set_no_period_on_snapshots_when_no_period() {
-    ComponentDto projectDto = ComponentTesting.newPrivateProjectDto(dbTester.organizations().insert(), "ABCD").setKey(PROJECT_KEY).setName("Project");
+    ComponentDto projectDto = ComponentTesting.newPrivateProjectDto(dbTester.organizations().insert(), "ABCD").setDbKey(PROJECT_KEY).setName("Project");
     dbClient.componentDao().insert(dbTester.getSession(), projectDto);
     SnapshotDto snapshotDto = SnapshotTesting.newAnalysis(projectDto);
     dbClient.snapshotDao().insert(dbTester.getSession(), snapshotDto);

server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportPersistComponentsStepTest.java

@@ -224,9 +224,9 @@ public class ReportPersistComponentsStepTest extends BaseStepTest {
   @Test
   public void persist_only_new_components() {
     // Project and module already exists
-    ComponentDto project = newPrivateProjectDto(dbTester.getDefaultOrganization(), "ABCD").setKey(PROJECT_KEY).setName("Project");
+    ComponentDto project = newPrivateProjectDto(dbTester.getDefaultOrganization(), "ABCD").setDbKey(PROJECT_KEY).setName("Project");
     dbClient.componentDao().insert(dbTester.getSession(), project);
-    ComponentDto module = ComponentTesting.newModuleDto("BCDE", project).setKey(MODULE_KEY).setName("Module");
+    ComponentDto module = ComponentTesting.newModuleDto("BCDE", project).setDbKey(MODULE_KEY).setName("Module");
     dbClient.componentDao().insert(dbTester.getSession(), module);
     dbTester.getSession().commit();
 
@@ -325,7 +325,7 @@ public class ReportPersistComponentsStepTest extends BaseStepTest {
   }
 
   private ReportComponent.Builder asTreeRoot(ComponentDto project) {
-    return builder(PROJECT, 1).setUuid(project.uuid()).setKey(project.key()).setName(project.name());
+    return builder(PROJECT, 1).setUuid(project.uuid()).setKey(project.getDbKey()).setName(project.name());
   }
 
   public ComponentDto insertProject() {
@@ -376,13 +376,13 @@ public class ReportPersistComponentsStepTest extends BaseStepTest {
 
   @Test
   public void nothing_to_persist() {
-    ComponentDto project = newPrivateProjectDto(dbTester.organizations().insert(), "ABCD").setKey(PROJECT_KEY).setName("Project");
+    ComponentDto project = newPrivateProjectDto(dbTester.organizations().insert(), "ABCD").setDbKey(PROJECT_KEY).setName("Project");
     dbClient.componentDao().insert(dbTester.getSession(), project);
-    ComponentDto module = ComponentTesting.newModuleDto("BCDE", project).setKey(MODULE_KEY).setName("Module");
+    ComponentDto module = ComponentTesting.newModuleDto("BCDE", project).setDbKey(MODULE_KEY).setName("Module");
     dbClient.componentDao().insert(dbTester.getSession(), module);
-    ComponentDto directory = ComponentTesting.newDirectory(module, "src/main/java/dir").setUuid("CDEF").setKey("MODULE_KEY:src/main/java/dir");
+    ComponentDto directory = ComponentTesting.newDirectory(module, "src/main/java/dir").setUuid("CDEF").setDbKey("MODULE_KEY:src/main/java/dir");
     ComponentDto file = ComponentTesting.newFileDto(module, directory, "DEFG").setPath("src/main/java/dir/Foo.java").setName("Foo.java")
-      .setKey("MODULE_KEY:src/main/java/dir/Foo.java");
+      .setDbKey("MODULE_KEY:src/main/java/dir/Foo.java");
     dbClient.componentDao().insert(dbTester.getSession(), directory, file);
     dbTester.getSession().commit();
 
@@ -451,9 +451,9 @@ public class ReportPersistComponentsStepTest extends BaseStepTest {
 
   @Test
   public void update_module_name_and_description() {
-    ComponentDto project = newPrivateProjectDto(dbTester.getDefaultOrganization(), "ABCD").setKey(PROJECT_KEY).setName("Project").setDescription("Project description");
+    ComponentDto project = newPrivateProjectDto(dbTester.getDefaultOrganization(), "ABCD").setDbKey(PROJECT_KEY).setName("Project").setDescription("Project description");
     dbClient.componentDao().insert(dbTester.getSession(), project);
-    ComponentDto module = ComponentTesting.newModuleDto("BCDE", project).setKey(MODULE_KEY).setName("Module");
+    ComponentDto module = ComponentTesting.newModuleDto("BCDE", project).setDbKey(MODULE_KEY).setName("Module");
     dbClient.componentDao().insert(dbTester.getSession(), module);
     dbTester.getSession().commit();
 
@@ -490,9 +490,9 @@ public class ReportPersistComponentsStepTest extends BaseStepTest {
 
   @Test
   public void update_module_path() {
-    ComponentDto project = newPrivateProjectDto(dbTester.organizations().insert(), "ABCD").setKey(PROJECT_KEY).setName("Project");
+    ComponentDto project = newPrivateProjectDto(dbTester.organizations().insert(), "ABCD").setDbKey(PROJECT_KEY).setName("Project");
     dbClient.componentDao().insert(dbTester.getSession(), project);
-    ComponentDto module = ComponentTesting.newModuleDto("BCDE", project).setKey(MODULE_KEY).setName("Module").setPath("path");
+    ComponentDto module = ComponentTesting.newModuleDto("BCDE", project).setDbKey(MODULE_KEY).setName("Module").setPath("path");
     dbClient.componentDao().insert(dbTester.getSession(), module);
     dbTester.getSession().commit();
 
@@ -517,18 +517,18 @@ public class ReportPersistComponentsStepTest extends BaseStepTest {
 
   @Test
   public void update_module_uuid_when_moving_a_module() {
-    ComponentDto project = newPrivateProjectDto(dbTester.getDefaultOrganization(), "ABCD").setKey(PROJECT_KEY).setName("Project");
+    ComponentDto project = newPrivateProjectDto(dbTester.getDefaultOrganization(), "ABCD").setDbKey(PROJECT_KEY).setName("Project");
     dbClient.componentDao().insert(dbTester.getSession(), project);
     ComponentDto moduleA = ComponentTesting.newModuleDto("EDCB", project)
-      .setKey("MODULE_A")
+      .setDbKey("MODULE_A")
       .setName("Module A");
     ComponentDto moduleB = ComponentTesting.newModuleDto("BCDE", project)
-      .setKey("MODULE_B")
+      .setDbKey("MODULE_B")
       .setName("Module B");
     dbClient.componentDao().insert(dbTester.getSession(), moduleA, moduleB);
-    ComponentDto directory = ComponentTesting.newDirectory(moduleB, "src/main/java/dir").setUuid("CDEF").setKey("MODULE_B:src/main/java/dir");
+    ComponentDto directory = ComponentTesting.newDirectory(moduleB, "src/main/java/dir").setUuid("CDEF").setDbKey("MODULE_B:src/main/java/dir");
     ComponentDto file = ComponentTesting.newFileDto(moduleB, directory, "DEFG").setPath("src/main/java/dir/Foo.java").setName("Foo.java")
-      .setKey("MODULE_B:src/main/java/dir/Foo.java");
+      .setDbKey("MODULE_B:src/main/java/dir/Foo.java");
     dbClient.componentDao().insert(dbTester.getSession(), directory, file);
     dbTester.getSession().commit();
 
@@ -594,9 +594,9 @@ public class ReportPersistComponentsStepTest extends BaseStepTest {
   @Test
   public void do_not_update_created_at_on_existing_component() {
     Date oldDate = DateUtils.parseDate("2015-01-01");
-    ComponentDto project = newPrivateProjectDto(dbTester.getDefaultOrganization(), "ABCD").setKey(PROJECT_KEY).setName("Project").setCreatedAt(oldDate);
+    ComponentDto project = newPrivateProjectDto(dbTester.getDefaultOrganization(), "ABCD").setDbKey(PROJECT_KEY).setName("Project").setCreatedAt(oldDate);
     dbClient.componentDao().insert(dbTester.getSession(), project);
-    ComponentDto module = ComponentTesting.newModuleDto("BCDE", project).setKey(MODULE_KEY).setName("Module").setPath("path").setCreatedAt(oldDate);
+    ComponentDto module = ComponentTesting.newModuleDto("BCDE", project).setDbKey(MODULE_KEY).setName("Module").setPath("path").setCreatedAt(oldDate);
     dbClient.componentDao().insert(dbTester.getSession(), module);
     dbTester.getSession().commit();
 
@@ -612,21 +612,21 @@ public class ReportPersistComponentsStepTest extends BaseStepTest {
 
   @Test
   public void persist_components_that_were_previously_removed() {
-    ComponentDto project = newPrivateProjectDto(dbTester.organizations().insert(), "ABCD").setKey(PROJECT_KEY).setName("Project");
+    ComponentDto project = newPrivateProjectDto(dbTester.organizations().insert(), "ABCD").setDbKey(PROJECT_KEY).setName("Project");
     dbClient.componentDao().insert(dbTester.getSession(), project);
     ComponentDto removedModule = ComponentTesting.newModuleDto("BCDE", project)
-      .setKey(MODULE_KEY)
+      .setDbKey(MODULE_KEY)
       .setName("Module")
       .setEnabled(false);
     dbClient.componentDao().insert(dbTester.getSession(), removedModule);
     ComponentDto removedDirectory = ComponentTesting.newDirectory(removedModule, "src/main/java/dir")
       .setUuid("CDEF")
-      .setKey("MODULE_KEY:src/main/java/dir")
+      .setDbKey("MODULE_KEY:src/main/java/dir")
       .setEnabled(false);
     ComponentDto removedFile = ComponentTesting.newFileDto(removedModule, removedDirectory, "DEFG")
       .setPath("src/main/java/dir/Foo.java")
       .setName("Foo.java")
-      .setKey("MODULE_KEY:src/main/java/dir/Foo.java")
+      .setDbKey("MODULE_KEY:src/main/java/dir/Foo.java")
       .setEnabled(false);
     dbClient.componentDao().insert(dbTester.getSession(), removedDirectory, removedFile);
     dbTester.getSession().commit();
@@ -655,7 +655,7 @@ public class ReportPersistComponentsStepTest extends BaseStepTest {
     assertThat(dbClient.componentDao().selectByKey(dbTester.getSession(), MODULE_KEY).get().getId()).isEqualTo(removedModule.getId());
     assertThat(dbClient.componentDao().selectByKey(dbTester.getSession(), "MODULE_KEY:src/main/java/dir").get().getId()).isEqualTo(removedDirectory.getId());
     assertThat(dbClient.componentDao().selectByKey(dbTester.getSession(), "MODULE_KEY:src/main/java/dir/Foo.java").get().getId()).isEqualTo(removedFile.getId());
-    assertExistButDisabled(removedModule.key(), removedDirectory.getKey(), removedFile.getKey());
+    assertExistButDisabled(removedModule.getDbKey(), removedDirectory.getDbKey(), removedFile.getDbKey());
 
     // commit the functional transaction
     dbClient.componentDao().applyBChangesForRootComponentUuid(dbTester.getSession(), project.uuid());
@@ -714,15 +714,15 @@ public class ReportPersistComponentsStepTest extends BaseStepTest {
 
   @Test
   public void update_module_uuid_when_reactivating_removed_component() {
-    ComponentDto project = newPrivateProjectDto(dbTester.getDefaultOrganization(), "ABCD").setKey(PROJECT_KEY).setName("Project");
+    ComponentDto project = newPrivateProjectDto(dbTester.getDefaultOrganization(), "ABCD").setDbKey(PROJECT_KEY).setName("Project");
     dbClient.componentDao().insert(dbTester.getSession(), project);
-    ComponentDto module = ComponentTesting.newModuleDto("BCDE", project).setKey(MODULE_KEY).setName("Module");
-    ComponentDto removedModule = ComponentTesting.newModuleDto("EDCD", project).setKey("REMOVED_MODULE_KEY").setName("Removed Module").setEnabled(false);
+    ComponentDto module = ComponentTesting.newModuleDto("BCDE", project).setDbKey(MODULE_KEY).setName("Module");
+    ComponentDto removedModule = ComponentTesting.newModuleDto("EDCD", project).setDbKey("REMOVED_MODULE_KEY").setName("Removed Module").setEnabled(false);
     dbClient.componentDao().insert(dbTester.getSession(), module, removedModule);
-    ComponentDto directory = ComponentTesting.newDirectory(module, "src/main/java/dir").setUuid("CDEF").setKey("MODULE_KEY:src/main/java/dir");
+    ComponentDto directory = ComponentTesting.newDirectory(module, "src/main/java/dir").setUuid("CDEF").setDbKey("MODULE_KEY:src/main/java/dir");
     // The file was attached to another module
     ComponentDto removedFile = ComponentTesting.newFileDto(removedModule, directory, "DEFG").setPath("src/main/java/dir/Foo.java").setName("Foo.java")
-      .setKey("MODULE_KEY:src/main/java/dir/Foo.java").setEnabled(false);
+      .setDbKey("MODULE_KEY:src/main/java/dir/Foo.java").setEnabled(false);
     dbClient.componentDao().insert(dbTester.getSession(), directory, removedFile);
     dbTester.getSession().commit();
 
@@ -770,11 +770,11 @@ public class ReportPersistComponentsStepTest extends BaseStepTest {
   public void persists_existing_components_with_visibility_of_root_in_db_out_of_functional_transaction() {
     boolean isRootPrivate = new Random().nextBoolean();
     OrganizationDto organization = dbTester.organizations().insert();
-    ComponentDto project = newPrivateProjectDto(organization, "ABCD").setKey(PROJECT_KEY).setName("Project").setPrivate(isRootPrivate);
+    ComponentDto project = newPrivateProjectDto(organization, "ABCD").setDbKey(PROJECT_KEY).setName("Project").setPrivate(isRootPrivate);
     dbTester.components().insertComponent(project);
-    ComponentDto module = newModuleDto(project).setUuid("BCDE").setKey("MODULE").setPrivate(!isRootPrivate);
+    ComponentDto module = newModuleDto(project).setUuid("BCDE").setDbKey("MODULE").setPrivate(!isRootPrivate);
     dbTester.components().insertComponent(module);
-    dbTester.components().insertComponent(newDirectory(module, "DEFG", "Directory").setKey("DIR").setPrivate(isRootPrivate));
+    dbTester.components().insertComponent(newDirectory(module, "DEFG", "Directory").setDbKey("DIR").setPrivate(isRootPrivate));
     treeRootHolder.setRoot(createSampleProjectComponentTree(project));
 
     underTest.execute();
@@ -786,7 +786,7 @@ public class ReportPersistComponentsStepTest extends BaseStepTest {
   }
 
   private ReportComponent createSampleProjectComponentTree(ComponentDto project) {
-    return createSampleProjectComponentTree(project.uuid(), project.key());
+    return createSampleProjectComponentTree(project.uuid(), project.getDbKey());
   }
 
   private ReportComponent createSampleProjectComponentTree(String projectUuid, String projectKey) {

server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ValidateProjectStepTest.java

@@ -36,9 +36,9 @@ import org.sonar.scanner.protocol.output.ScannerReport;
 import org.sonar.scanner.protocol.output.ScannerReport.Component.ComponentType;
 import org.sonar.server.computation.task.projectanalysis.analysis.AnalysisMetadataHolderRule;
 import org.sonar.server.computation.task.projectanalysis.batch.BatchReportReaderRule;
-import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule;
 import org.sonar.server.computation.task.projectanalysis.component.Component;
 import org.sonar.server.computation.task.projectanalysis.component.ReportComponent;
+import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule;
 
 public class ValidateProjectStepTest {
 
@@ -77,7 +77,7 @@ public class ValidateProjectStepTest {
       .build());
     treeRootHolder.setRoot(ReportComponent.builder(Component.Type.PROJECT, 1).setUuid("ABCD").setKey(PROJECT_KEY).build());
 
-    ComponentDto project = ComponentTesting.newView(dbTester.organizations().insert(), "ABCD").setKey(PROJECT_KEY);
+    ComponentDto project = ComponentTesting.newView(dbTester.organizations().insert(), "ABCD").setDbKey(PROJECT_KEY);
     dbClient.componentDao().insert(dbTester.getSession(), project);
     dbTester.getSession().commit();
 
@@ -159,7 +159,7 @@ public class ValidateProjectStepTest {
       .setKey(MODULE_KEY)
       .build());
 
-    ComponentDto project = ComponentTesting.newPrivateProjectDto(dbTester.organizations().insert(), "ABCD").setKey(MODULE_KEY);
+    ComponentDto project = ComponentTesting.newPrivateProjectDto(dbTester.organizations().insert(), "ABCD").setDbKey(MODULE_KEY);
     dbClient.componentDao().insert(dbTester.getSession(), project);
     dbTester.getSession().commit();
 
@@ -192,10 +192,10 @@ public class ValidateProjectStepTest {
       .build());
 
     OrganizationDto organizationDto = dbTester.organizations().insert();
-    ComponentDto project = ComponentTesting.newPrivateProjectDto(organizationDto, "ABCD").setKey(PROJECT_KEY);
-    ComponentDto anotherProject = ComponentTesting.newPrivateProjectDto(organizationDto).setKey(anotherProjectKey);
+    ComponentDto project = ComponentTesting.newPrivateProjectDto(organizationDto, "ABCD").setDbKey(PROJECT_KEY);
+    ComponentDto anotherProject = ComponentTesting.newPrivateProjectDto(organizationDto).setDbKey(anotherProjectKey);
     dbClient.componentDao().insert(dbTester.getSession(), project, anotherProject);
-    ComponentDto module = ComponentTesting.newModuleDto("BCDE", anotherProject).setKey(MODULE_KEY);
+    ComponentDto module = ComponentTesting.newModuleDto("BCDE", anotherProject).setDbKey(MODULE_KEY);
     dbClient.componentDao().insert(dbTester.getSession(), module);
     dbTester.getSession().commit();
 
@@ -226,9 +226,9 @@ public class ValidateProjectStepTest {
       .setKey(MODULE_KEY)
       .build());
 
-    ComponentDto anotherProject = ComponentTesting.newPrivateProjectDto(dbTester.organizations().insert()).setKey(anotherProjectKey);
+    ComponentDto anotherProject = ComponentTesting.newPrivateProjectDto(dbTester.organizations().insert()).setDbKey(anotherProjectKey);
     dbClient.componentDao().insert(dbTester.getSession(), anotherProject);
-    ComponentDto module = ComponentTesting.newModuleDto("ABCD", anotherProject).setKey(PROJECT_KEY);
+    ComponentDto module = ComponentTesting.newModuleDto("ABCD", anotherProject).setDbKey(PROJECT_KEY);
     dbClient.componentDao().insert(dbTester.getSession(), module);
     dbTester.getSession().commit();
 
@@ -255,7 +255,7 @@ public class ValidateProjectStepTest {
       .addChildRef(2)
       .build());
 
-    ComponentDto project = ComponentTesting.newPrivateProjectDto(dbTester.organizations().insert(), "ABCD").setKey(PROJECT_KEY);
+    ComponentDto project = ComponentTesting.newPrivateProjectDto(dbTester.organizations().insert(), "ABCD").setDbKey(PROJECT_KEY);
     dbClient.componentDao().insert(dbTester.getSession(), project);
     dbClient.snapshotDao().insert(dbTester.getSession(), SnapshotTesting.newAnalysis(project).setCreatedAt(1420088400000L)); // 2015-01-01
     dbTester.getSession().commit();
@@ -276,7 +276,7 @@ public class ValidateProjectStepTest {
       .addChildRef(2)
       .build());
 
-    ComponentDto project = ComponentTesting.newPrivateProjectDto(dbTester.organizations().insert(), "ABCD").setKey(PROJECT_KEY);
+    ComponentDto project = ComponentTesting.newPrivateProjectDto(dbTester.organizations().insert(), "ABCD").setDbKey(PROJECT_KEY);
     dbClient.componentDao().insert(dbTester.getSession(), project);
     dbClient.snapshotDao().insert(dbTester.getSession(), SnapshotTesting.newAnalysis(project).setCreatedAt(1433131200000L)); // 2015-06-01
     dbTester.getSession().commit();

server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsPersistAnalysisStepTest.java

@@ -97,7 +97,7 @@ public class ViewsPersistAnalysisStepTest extends BaseStepTest {
   @Test
   public void persist_analysis() {
     OrganizationDto organizationDto = dbTester.organizations().insert();
-    ComponentDto viewDto = save(newView(organizationDto, "UUID_VIEW").setKey("KEY_VIEW"));
+    ComponentDto viewDto = save(newView(organizationDto, "UUID_VIEW").setDbKey("KEY_VIEW"));
     save(newSubView(viewDto, "UUID_SUBVIEW", "KEY_SUBVIEW"));
     save(newPrivateProjectDto(organizationDto, "proj"));
     dbTester.getSession().commit();
@@ -124,7 +124,7 @@ public class ViewsPersistAnalysisStepTest extends BaseStepTest {
   @Test
   public void persist_snapshots_with_leak_period() {
     OrganizationDto organizationDto = dbTester.organizations().insert();
-    ComponentDto viewDto = save(newView(organizationDto, "UUID_VIEW").setKey("KEY_VIEW"));
+    ComponentDto viewDto = save(newView(organizationDto, "UUID_VIEW").setDbKey("KEY_VIEW"));
     ComponentDto subViewDto = save(newSubView(viewDto, "UUID_SUBVIEW", "KEY_SUBVIEW"));
     dbTester.getSession().commit();
 

server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsPersistComponentsStepTest.java

@@ -50,8 +50,8 @@ import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
-import static org.sonar.db.component.ComponentTesting.newProjectCopy;
 import static org.sonar.db.component.ComponentTesting.newPrivateProjectDto;
+import static org.sonar.db.component.ComponentTesting.newProjectCopy;
 import static org.sonar.db.component.ComponentTesting.newSubView;
 import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.PROJECT_VIEW;
 import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.SUBVIEW;
@@ -301,7 +301,7 @@ public class ViewsPersistComponentsStepTest extends BaseStepTest {
     persistComponents(view, project);
     ComponentDto projectView = ComponentTesting.newProjectCopy(PROJECT_VIEW_1_UUID, project, view)
       .setOrganizationUuid(ORGANIZATION_UUID)
-      .setKey(PROJECT_VIEW_1_KEY)
+      .setDbKey(PROJECT_VIEW_1_KEY)
       .setName("Old name")
       .setCreatedAt(now);
     persistComponents(projectView);
@@ -332,7 +332,7 @@ public class ViewsPersistComponentsStepTest extends BaseStepTest {
 
     // Project view in DB is associated to project1
     ComponentDto projectView = ComponentTesting.newProjectCopy(PROJECT_VIEW_1_UUID, project1, view)
-      .setKey(PROJECT_VIEW_1_KEY)
+      .setDbKey(PROJECT_VIEW_1_KEY)
       .setCreatedAt(now);
     persistComponents(projectView);
 
@@ -399,7 +399,7 @@ public class ViewsPersistComponentsStepTest extends BaseStepTest {
     boolean isRootPrivate = new Random().nextBoolean();
     ComponentDto project = dbTester.components().insertComponent(ComponentTesting.newPrivateProjectDto(dbTester.organizations().insert()));
     OrganizationDto organization = dbTester.organizations().insert();
-    ComponentDto view = newViewDto(organization).setUuid(VIEW_UUID).setKey(VIEW_KEY).setName("View").setPrivate(isRootPrivate);
+    ComponentDto view = newViewDto(organization).setUuid(VIEW_UUID).setDbKey(VIEW_KEY).setName("View").setPrivate(isRootPrivate);
     dbTester.components().insertComponent(view);
     treeRootHolder.setRoot(
       createViewBuilder(PORTFOLIO)
@@ -423,11 +423,11 @@ public class ViewsPersistComponentsStepTest extends BaseStepTest {
     boolean isRootPrivate = new Random().nextBoolean();
     ComponentDto project = dbTester.components().insertComponent(ComponentTesting.newPrivateProjectDto(dbTester.organizations().insert()));
     OrganizationDto organization = dbTester.organizations().insert();
-    ComponentDto view = newViewDto(organization).setUuid(VIEW_UUID).setKey(VIEW_KEY).setName("View").setPrivate(isRootPrivate);
+    ComponentDto view = newViewDto(organization).setUuid(VIEW_UUID).setDbKey(VIEW_KEY).setName("View").setPrivate(isRootPrivate);
     dbTester.components().insertComponent(view);
-    ComponentDto subView = newSubView(view).setUuid("BCDE").setKey("MODULE").setPrivate(!isRootPrivate);
+    ComponentDto subView = newSubView(view).setUuid("BCDE").setDbKey("MODULE").setPrivate(!isRootPrivate);
     dbTester.components().insertComponent(subView);
-    dbTester.components().insertComponent(newProjectCopy("DEFG", project, view).setKey("DIR").setPrivate(isRootPrivate));
+    dbTester.components().insertComponent(newProjectCopy("DEFG", project, view).setDbKey("DIR").setPrivate(isRootPrivate));
     treeRootHolder.setRoot(
       createViewBuilder(PORTFOLIO)
         .addChildren(
@@ -488,7 +488,7 @@ public class ViewsPersistComponentsStepTest extends BaseStepTest {
   private ComponentDto newViewDto(OrganizationDto organizationDto) {
     return ComponentTesting.newView(organizationDto, VIEW_UUID)
       .setOrganizationUuid(ORGANIZATION_UUID)
-      .setKey(VIEW_KEY)
+      .setDbKey(VIEW_KEY)
       .setName(VIEW_NAME);
   }
 

server/sonar-server/src/test/java/org/sonar/server/duplication/ws/DuplicationsParserTest.java

@@ -69,21 +69,21 @@ public class DuplicationsParserTest {
     project1 = ComponentTesting.newPrivateProjectDto(organizationDto)
       .setName("SonarQube")
       .setLongName("SonarQube")
-      .setKey("org.codehaus.sonar:sonar");
+      .setDbKey("org.codehaus.sonar:sonar");
     project2 = ComponentTesting.newPrivateProjectDto(organizationDto);
     componentDao.insert(dbSession, project1, project2);
 
     // Current file
     String key1 = "org.codehaus.sonar:sonar-plugin-api:src/main/java/org/sonar/api/utils/command/CommandExecutor.java";
-    currentFile = newFileDto(project1, null).setKey(key1).setLongName("CommandExecutor");
+    currentFile = newFileDto(project1, null).setDbKey(key1).setLongName("CommandExecutor");
 
     // File on same project
     String key2 = "org.codehaus.sonar:sonar-plugin-api:src/main/java/com/sonar/orchestrator/util/CommandExecutor.java";
-    fileOnSameProject = newFileDto(project1, null).setKey(key2).setLongName("CommandExecutor");
+    fileOnSameProject = newFileDto(project1, null).setDbKey(key2).setLongName("CommandExecutor");
 
     // File on different project
     String key3 = "com.sonarsource.orchestrator:sonar-orchestrator:src/main/java/com/sonar/orchestrator/util/CommandExecutor.java";
-    fileOnDifferentProject = newFileDto(project2, null).setKey(key3).setLongName("CommandExecutor");
+    fileOnDifferentProject = newFileDto(project2, null).setDbKey(key3).setLongName("CommandExecutor");
 
     componentDao.insert(dbSession, currentFile, fileOnSameProject, fileOnDifferentProject);
     dbSession.commit();
@@ -190,7 +190,7 @@ public class DuplicationsParserTest {
     assertThat(duplication1.from()).isEqualTo(31);
     assertThat(duplication1.size()).isEqualTo(5);
 
-    DuplicationsParser.Duplication duplication2 = duplication(duplications, fileOnSameProject.key());
+    DuplicationsParser.Duplication duplication2 = duplication(duplications, fileOnSameProject.getDbKey());
     assertThat(duplication2.file()).isEqualTo(fileOnSameProject);
     assertThat(duplication2.from()).isEqualTo(20);
     assertThat(duplication2.size()).isEqualTo(5);
@@ -235,7 +235,7 @@ public class DuplicationsParserTest {
     return Iterables.find(duplications, new Predicate<DuplicationsParser.Duplication>() {
       @Override
       public boolean apply(@Nullable DuplicationsParser.Duplication input) {
-        return input != null && (componentKey == null ? input.file() == null : input.file() != null && componentKey.equals(input.file().key()));
+        return input != null && (componentKey == null ? input.file() == null : input.file() != null && componentKey.equals(input.file().getDbKey()));
       }
     });
   }

server/sonar-server/src/test/java/org/sonar/server/duplication/ws/ShowActionTest.java

@@ -69,7 +69,7 @@ public class ShowActionTest {
   @Test
   public void get_duplications_by_file_key() throws Exception {
     TestRequest request = newBaseRequest();
-    verifyCallToFileWithDuplications(file -> request.setParam("key", file.key()));
+    verifyCallToFileWithDuplications(file -> request.setParam("key", file.getDbKey()));
   }
 
   @Test
@@ -81,12 +81,12 @@ public class ShowActionTest {
   @Test
   public void return_file_with_missing_duplication_data() throws Exception {
     ComponentDto project = db.components().insertPrivateProject();
-    ComponentDto file = db.components().insertComponent(newFileDto(project).setKey("foo.js"));
+    ComponentDto file = db.components().insertComponent(newFileDto(project).setDbKey("foo.js"));
     db.components().insertSnapshot(newAnalysis(project));
 
     userSessionRule.addProjectPermission(UserRole.CODEVIEWER, project);
 
-    TestResponse result = newBaseRequest().setParam("key", file.key()).execute();
+    TestResponse result = newBaseRequest().setParam("key", file.getDbKey()).execute();
 
     assertJson(result.getInput()).isSimilarTo("{\n" +
       "  \"duplications\": [],\n" +
@@ -108,7 +108,7 @@ public class ShowActionTest {
 
     expectedException.expect(ForbiddenException.class);
 
-    newBaseRequest().setParam("key", file.key()).execute();
+    newBaseRequest().setParam("key", file.getDbKey()).execute();
   }
 
   @Test
@@ -125,7 +125,7 @@ public class ShowActionTest {
 
   private void verifyCallToFileWithDuplications(Function<ComponentDto, TestRequest> requestFactory) throws Exception {
     ComponentDto project = db.components().insertPrivateProject();
-    ComponentDto file = db.components().insertComponent(newFileDto(project).setKey("foo.js"));
+    ComponentDto file = db.components().insertComponent(newFileDto(project).setDbKey("foo.js"));
     SnapshotDto snapshot = db.components().insertSnapshot(newAnalysis(project));
     String xml = "<duplications>\n" +
       "  <g>\n" +

server/sonar-server/src/test/java/org/sonar/server/duplication/ws/ShowResponseBuilderTest.java

@@ -61,17 +61,17 @@ public class ShowResponseBuilderTest {
     project = newPrivateProjectDto(organization)
       .setName("SonarQube")
       .setLongName("SonarQube")
-      .setKey("org.codehaus.sonar:sonar");
+      .setDbKey("org.codehaus.sonar:sonar");
     db.components().insertComponent(project);
   }
 
   @Test
   public void write_duplications() {
     String key1 = "org.codehaus.sonar:sonar-ws-client:src/main/java/org/sonar/wsclient/services/PropertyDeleteQuery.java";
-    ComponentDto file1 = ComponentTesting.newFileDto(project, null).setKey(key1).setLongName("PropertyDeleteQuery").setRootUuid("uuid_5");
+    ComponentDto file1 = ComponentTesting.newFileDto(project, null).setDbKey(key1).setLongName("PropertyDeleteQuery").setRootUuid("uuid_5");
     String key2 = "org.codehaus.sonar:sonar-ws-client:src/main/java/org/sonar/wsclient/services/PropertyUpdateQuery.java";
-    ComponentDto file2 = ComponentTesting.newFileDto(project, null).setQualifier("FIL").setKey(key2).setLongName("PropertyUpdateQuery").setRootUuid("uuid_5");
-    ComponentDto project2 = db.components().insertPrivateProject(organization, p -> p.setUuid("uuid_5").setKey("org.codehaus.sonar:sonar-ws-client")
+    ComponentDto file2 = ComponentTesting.newFileDto(project, null).setQualifier("FIL").setDbKey(key2).setLongName("PropertyUpdateQuery").setRootUuid("uuid_5");
+    ComponentDto project2 = db.components().insertPrivateProject(organization, p -> p.setUuid("uuid_5").setDbKey("org.codehaus.sonar:sonar-ws-client")
       .setLongName("SonarQube :: Web Service Client"));
 
     db.components().insertComponent(file1);
@@ -126,9 +126,9 @@ public class ShowResponseBuilderTest {
   @Test
   public void write_duplications_without_sub_project() {
     String key1 = "org.codehaus.sonar:sonar-ws-client:src/main/java/org/sonar/wsclient/services/PropertyDeleteQuery.java";
-    ComponentDto file1 = ComponentTesting.newFileDto(project, null).setId(10L).setKey(key1).setLongName("PropertyDeleteQuery");
+    ComponentDto file1 = ComponentTesting.newFileDto(project, null).setId(10L).setDbKey(key1).setLongName("PropertyDeleteQuery");
     String key2 = "org.codehaus.sonar:sonar-ws-client:src/main/java/org/sonar/wsclient/services/PropertyUpdateQuery.java";
-    ComponentDto file2 = ComponentTesting.newFileDto(project, null).setId(11L).setKey(key2).setLongName("PropertyUpdateQuery");
+    ComponentDto file2 = ComponentTesting.newFileDto(project, null).setId(11L).setDbKey(key2).setLongName("PropertyUpdateQuery");
 
     db.components().insertComponent(file1);
     db.components().insertComponent(file2);
@@ -173,7 +173,7 @@ public class ShowResponseBuilderTest {
   @Test
   public void write_duplications_with_a_removed_component() {
     String key1 = "org.codehaus.sonar:sonar-ws-client:src/main/java/org/sonar/wsclient/services/PropertyDeleteQuery.java";
-    ComponentDto file1 = ComponentTesting.newFileDto(project, null).setId(10L).setKey(key1).setLongName("PropertyDeleteQuery");
+    ComponentDto file1 = ComponentTesting.newFileDto(project, null).setId(10L).setDbKey(key1).setLongName("PropertyDeleteQuery");
     db.components().insertComponent(file1);
 
     List<DuplicationsParser.Block> blocks = newArrayList();

server/sonar-server/src/test/java/org/sonar/server/favorite/FavoriteUpdaterTest.java

@@ -39,7 +39,7 @@ public class FavoriteUpdaterTest {
   private static final String COMPONENT_KEY = "K1";
   private static final ComponentDto COMPONENT = ComponentTesting.newPrivateProjectDto(OrganizationTesting.newOrganizationDto())
     .setId(COMPONENT_ID)
-    .setKey(COMPONENT_KEY);
+    .setDbKey(COMPONENT_KEY);
   private static final int USER_ID = 42;
 
   @Rule

server/sonar-server/src/test/java/org/sonar/server/favorite/ws/AddActionTest.java

@@ -91,7 +91,7 @@ public class AddActionTest {
     ComponentDto file = db.components().insertComponent(newFileDto(project));
     userSession.addProjectPermission(UserRole.USER, project, file);
 
-    call(file.key());
+    call(file.getDbKey());
 
     List<PropertyDto> favorites = dbClient.propertiesDao().selectByQuery(PropertyQuery.builder()
       .setUserId(USER_ID)
@@ -143,7 +143,7 @@ public class AddActionTest {
   }
 
   private ComponentDto insertProject() {
-    return db.components().insertComponent(newPrivateProjectDto(db.organizations().insert(), PROJECT_UUID).setKey(PROJECT_KEY));
+    return db.components().insertComponent(newPrivateProjectDto(db.organizations().insert(), PROJECT_UUID).setDbKey(PROJECT_KEY));
   }
 
   private ComponentDto insertProjectAndPermissions() {