rename subProjectId by parentProjectId in ComponentDto except in WS use

Conflicts:
	server/sonar-server/src/test/java/org/sonar/server/component/db/ComponentDaoTest.java
	sonar-core/src/test/java/org/sonar/core/component/ComponentDtoTest.java

14 files changed, 67 insertions, 63 deletions

diff --git a/server/sonar-server/src/main/java/org/sonar/server/component/ws/ComponentAppAction.java b/server/sonar-server/src/main/java/org/sonar/server/component/ws/ComponentAppAction.java
index b0e1886a552..9d40afb9191 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/component/ws/ComponentAppAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/component/ws/ComponentAppAction.java
@@ -170,14 +170,15 @@ public class ComponentAppAction implements RequestHandler {
     json.prop("longName", component.longName());
     json.prop("q", component.qualifier());
 
-    ComponentDto subProject = nullableComponentById(component.subProjectId(), session);
+    ComponentDto parentProject = nullableComponentById(component.parentProjectId(), session);
     ComponentDto project = dbClient.componentDao().getByUuid(session, component.projectUuid());
 
-    // Do not display sub project if sub project and project are the same
-    boolean displaySubProject = subProject != null && !subProject.getId().equals(project.getId());
+    // Do not display parent project if parent project and project are the same
+    boolean displayParentProject = parentProject != null && !parentProject.getId().equals(project.getId());
 
-    json.prop("subProject", displaySubProject ? subProject.key() : null);
-    json.prop("subProjectName", displaySubProject ? subProject.longName() : null);
+    // TODO WS should return parentProject and parentProjectName instead of sub
+    json.prop("subProject", displayParentProject ? parentProject.key() : null);
+    json.prop("subProjectName", displayParentProject ? parentProject.longName() : null);
     json.prop("project", project.key());
     json.prop("projectName", project.longName());
 
@@ -381,6 +382,7 @@ public class ComponentAppAction implements RequestHandler {
     }
     return null;
   }
+
   @CheckForNull
   private String formatMeasureOrVariation(@Nullable MeasureDto measure, @Nullable Integer periodIndex) {
     if (periodIndex == null) {
diff --git a/server/sonar-server/src/main/java/org/sonar/server/duplication/ws/DuplicationsJsonWriter.java b/server/sonar-server/src/main/java/org/sonar/server/duplication/ws/DuplicationsJsonWriter.java
index 9a72cef1916..3ae866f26b8 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/duplication/ws/DuplicationsJsonWriter.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/duplication/ws/DuplicationsJsonWriter.java
@@ -85,7 +85,7 @@ public class DuplicationsJsonWriter implements ServerComponent {
 
   private void writeFiles(Map<String, String> refByComponentKey, JsonWriter json, DbSession session) {
     Map<String, ComponentDto> projectsByUuid = newHashMap();
-    Map<Long, ComponentDto> subProjectsById = newHashMap();
+    Map<Long, ComponentDto> parentProjectsById = newHashMap();
     for (Map.Entry<String, String> entry : refByComponentKey.entrySet()) {
       String componentKey = entry.getKey();
       String ref = entry.getValue();
@@ -95,8 +95,8 @@ public class DuplicationsJsonWriter implements ServerComponent {
 
         addFile(json, file);
         ComponentDto project = getProject(file.projectUuid(), projectsByUuid, session);
-        ComponentDto subProject = getSubProject(file.subProjectId(), subProjectsById, session);
-        addProject(json, project, subProject);
+        ComponentDto parentProject = getParentProject(file.parentProjectId(), parentProjectsById, session);
+        addProject(json, project, parentProject);
 
         json.endObject();
       }
@@ -133,7 +133,7 @@ public class DuplicationsJsonWriter implements ServerComponent {
     return project;
   }
 
-  private ComponentDto getSubProject(@Nullable Long projectId, Map<Long, ComponentDto> subProjectsById, DbSession session) {
+  private ComponentDto getParentProject(@Nullable Long projectId, Map<Long, ComponentDto> subProjectsById, DbSession session) {
     ComponentDto project = subProjectsById.get(projectId);
     if (project == null && projectId != null) {
       project = componentDao.getNullableById(projectId, session);
diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/IssueShowAction.java b/server/sonar-server/src/main/java/org/sonar/server/issue/ws/IssueShowAction.java
index a057ead4ff0..87340b7eaf1 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/IssueShowAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/issue/ws/IssueShowAction.java
@@ -167,15 +167,15 @@ public class IssueShowAction implements RequestHandler {
 
   private void addComponents(DbSession session, Issue issue, JsonWriter json) {
     ComponentDto component = dbClient.componentDao().getByUuid(session, issue.componentUuid());
-    Long subProjectId = component.subProjectId();
-    ComponentDto subProject = subProjectId != null ? dbClient.componentDao().getNullableById(subProjectId, session) : null;
+    Long parentProjectId = component.parentProjectId();
+    ComponentDto parentProject = parentProjectId != null ? dbClient.componentDao().getNullableById(parentProjectId, session) : null;
     ComponentDto project = dbClient.componentDao().getByUuid(session, component.projectUuid());
 
     String projectName = project.longName() != null ? project.longName() : project.name();
     // Do not display sub project long name if sub project and project are the same
-    boolean displaySubProjectLongName = subProject != null && !subProject.getId().equals(project.getId());
-    String subProjectKey = displaySubProjectLongName ? subProject.key() : null;
-    String subProjectName = displaySubProjectLongName ? subProject.longName() != null ? subProject.longName() : subProject.name() : null;
+    boolean displayParentProjectLongName = parentProject != null && !parentProject.getId().equals(project.getId());
+    String parentProjectKey = displayParentProjectLongName ? parentProject.key() : null;
+    String parentProjectName = displayParentProjectLongName ? parentProject.longName() != null ? parentProject.longName() : parentProject.name() : null;
 
     json
       .prop("component", component.key())
@@ -184,8 +184,9 @@ public class IssueShowAction implements RequestHandler {
       .prop("componentEnabled", component.isEnabled())
       .prop("project", project.key())
       .prop("projectName", projectName)
-      .prop("subProject", subProjectKey)
-      .prop("subProjectName", subProjectName);
+      //TODO replace subProject names by parentProject
+      .prop("subProject", parentProjectKey)
+      .prop("subProjectName", parentProjectName);
   }
 
   private void writeComments(Issue issue, JsonWriter json) {
diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchAction.java b/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchAction.java
index 3c5594ca554..a637aadd4b6 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchAction.java
@@ -306,7 +306,7 @@ public class SearchAction extends SearchRequestHandler<IssueQuery, Issue> {
       List<ComponentDto> subProjectDtos = dbClient.componentDao().findSubProjectsByComponentUuids(session, componentUuids);
       componentDtos.addAll(fileDtos);
       componentDtos.addAll(subProjectDtos);
-      for (ComponentDto component: componentDtos) {
+      for (ComponentDto component : componentDtos) {
         projectUuids.add(component.projectUuid());
       }
 
@@ -388,11 +388,11 @@ public class SearchAction extends SearchRequestHandler<IssueQuery, Issue> {
     Collection<FacetValue> facetValues = results.getFacetValues(facetName);
     if (facetValues != null) {
       Map<String, Long> valuesByItem = Maps.newHashMap();
-      for (FacetValue value: facetValues) {
+      for (FacetValue value : facetValues) {
         valuesByItem.put(value.getKey(), value.getValue());
       }
       List<String> valuesToAdd = mandatoryValues == null ? Lists.<String>newArrayList() : mandatoryValues;
-      for (String item: valuesToAdd) {
+      for (String item : valuesToAdd) {
         if (!valuesByItem.containsKey(item)) {
           facetValues.add(new FacetValue(item, 0));
         }
@@ -400,7 +400,7 @@ public class SearchAction extends SearchRequestHandler<IssueQuery, Issue> {
     }
   }
 
-  private void collectFacetsData(Request request, Result<Issue> result, Set<String> projectUuids, Set<String> componentUuids, List<String> userLogins, Set<String> actionPlanKeys){
+  private void collectFacetsData(Request request, Result<Issue> result, Set<String> projectUuids, Set<String> componentUuids, List<String> userLogins, Set<String> actionPlanKeys) {
     collectFacetKeys(result, IssueFilterParameters.PROJECT_UUIDS, projectUuids);
     collectParameterValues(request, IssueFilterParameters.PROJECT_UUIDS, projectUuids);
     collectFacetKeys(result, IssueFilterParameters.COMPONENT_UUIDS, componentUuids);
@@ -417,7 +417,7 @@ public class SearchAction extends SearchRequestHandler<IssueQuery, Issue> {
   private void collectFacetKeys(Result<Issue> result, String facetName, Collection<String> facetKeys) {
     Collection<FacetValue> facetValues = result.getFacetValues(facetName);
     if (facetValues != null) {
-      for (FacetValue project: facetValues) {
+      for (FacetValue project : facetValues) {
         facetKeys.add(project.getKey());
       }
     }
@@ -609,9 +609,10 @@ public class SearchAction extends SearchRequestHandler<IssueQuery, Issue> {
         .prop("name", component.name())
         .prop("longName", component.longName())
         .prop("path", component.path())
-        // On a root project, subProjectId is null but projectId is equal to itself, which make no sense.
-        .prop("projectId", (component.projectUuid() != null && component.subProjectId() != null) ? project.getId() : null)
-        .prop("subProjectId", component.subProjectId())
+        // On a root project, parentProjectId is null but projectId is equal to itself, which make no sense.
+        .prop("projectId", (component.projectUuid() != null && component.parentProjectId() != null) ? project.getId() : null)
+        // TODO should be renamed to parentProjectId
+        .prop("subProjectId", component.parentProjectId())
         .endObject();
     }
     json.endArray();
@@ -647,7 +648,7 @@ public class SearchAction extends SearchRequestHandler<IssueQuery, Issue> {
 
   private void writeLanguages(JsonWriter json) {
     json.name("languages").beginArray();
-    for (Language language: languages.all()) {
+    for (Language language : languages.all()) {
       json.beginObject()
         .prop("key", language.getKey())
         .prop("name", language.getName())
diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/ComponentTesting.java b/server/sonar-server/src/test/java/org/sonar/server/component/ComponentTesting.java
index 8b79c9086f2..708ca0cbad6 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/component/ComponentTesting.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/component/ComponentTesting.java
@@ -36,7 +36,7 @@ public class ComponentTesting {
       .setKey("file")
       .setName("File")
       .setLongName("File")
-      .setSubProjectId(subProjectOrProject.getId())
+      .setParentProjectId(subProjectOrProject.getId())
       .setScope(Scopes.FILE)
       .setQualifier(Qualifiers.FILE)
       .setPath("src/main/xoo/org/sonar/samples/File.xoo")
@@ -53,7 +53,7 @@ public class ComponentTesting {
       .setKey("module")
       .setName("Module")
       .setLongName("Module")
-      .setSubProjectId(subProjectOrProject.getId())
+      .setParentProjectId(subProjectOrProject.getId())
       .setScope(Scopes.PROJECT)
       .setQualifier(Qualifiers.MODULE)
       .setPath("module")
@@ -69,7 +69,7 @@ public class ComponentTesting {
       .setKey("project")
       .setName("Project")
       .setLongName("Project")
-      .setSubProjectId(null)
+      .setParentProjectId(null)
       .setScope(Scopes.PROJECT)
       .setQualifier(Qualifiers.PROJECT)
       .setPath(null)
diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/db/ComponentDaoTest.java b/server/sonar-server/src/test/java/org/sonar/server/component/db/ComponentDaoTest.java
index 59606927380..ca50790fe13 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/component/db/ComponentDaoTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/component/db/ComponentDaoTest.java
@@ -68,7 +68,7 @@ public class ComponentDaoTest extends AbstractDaoTestCase {
     assertThat(result.uuid()).isEqualTo("KLMN");
     assertThat(result.moduleUuid()).isEqualTo("EFGH");
     assertThat(result.moduleUuidPath()).isEqualTo("ABCD.EFGH.");
-    assertThat(result.subProjectId()).isEqualTo(2);
+    assertThat(result.parentProjectId()).isEqualTo(2);
     assertThat(result.projectUuid()).isEqualTo("ABCD");
     assertThat(result.key()).isEqualTo("org.struts:struts-core:src/org/struts/RequestContext.java");
     assertThat(result.path()).isEqualTo("src/org/struts/RequestContext.java");
@@ -108,7 +108,7 @@ public class ComponentDaoTest extends AbstractDaoTestCase {
     assertThat(result.qualifier()).isEqualTo("FIL");
     assertThat(result.scope()).isEqualTo("FIL");
     assertThat(result.language()).isEqualTo("java");
-    assertThat(result.subProjectId()).isEqualTo(2);
+    assertThat(result.parentProjectId()).isEqualTo(2);
 
     assertThat(dao.getNullableByKey(session, "unknown")).isNull();
   }
@@ -136,7 +136,7 @@ public class ComponentDaoTest extends AbstractDaoTestCase {
     assertThat(result.qualifier()).isEqualTo("TRK");
     assertThat(result.scope()).isEqualTo("PRJ");
     assertThat(result.language()).isNull();
-    assertThat(result.subProjectId()).isNull();
+    assertThat(result.parentProjectId()).isNull();
     assertThat(result.getAuthorizationUpdatedAt()).isEqualTo(123456789L);
   }
 
@@ -156,7 +156,7 @@ public class ComponentDaoTest extends AbstractDaoTestCase {
     assertThat(result.qualifier()).isEqualTo("FIL");
     assertThat(result.scope()).isEqualTo("FIL");
     assertThat(result.language()).isEqualTo("java");
-    assertThat(result.subProjectId()).isEqualTo(2);
+    assertThat(result.parentProjectId()).isEqualTo(2);
 
     assertThat(dao.getByKeys(session, "unknown")).isEmpty();
   }
@@ -173,7 +173,7 @@ public class ComponentDaoTest extends AbstractDaoTestCase {
     assertThat(result.uuid()).isEqualTo("KLMN");
     assertThat(result.moduleUuid()).isEqualTo("EFGH");
     assertThat(result.moduleUuidPath()).isEqualTo("ABCD.EFGH.");
-    assertThat(result.subProjectId()).isEqualTo(2);
+    assertThat(result.parentProjectId()).isEqualTo(2);
     assertThat(result.projectUuid()).isEqualTo("ABCD");
     assertThat(result.key()).isEqualTo("org.struts:struts-core:src/org/struts/RequestContext.java");
     assertThat(result.path()).isEqualTo("src/org/struts/RequestContext.java");
@@ -348,7 +348,7 @@ public class ComponentDaoTest extends AbstractDaoTestCase {
       .setScope("FIL")
       .setLanguage("java")
       .setPath("src/org/struts/RequestContext.java")
-      .setSubProjectId(3L)
+      .setParentProjectId(3L)
       .setEnabled(true)
       .setAuthorizationUpdatedAt(123456789L);
 
@@ -377,7 +377,7 @@ public class ComponentDaoTest extends AbstractDaoTestCase {
       .setScope("FIL")
       .setLanguage("java")
       .setPath("src/org/struts/RequestContext.java")
-      .setSubProjectId(3L)
+      .setParentProjectId(3L)
       .setEnabled(false)
       .setAuthorizationUpdatedAt(123456789L);
 
diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/ws/ComponentAppActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/component/ws/ComponentAppActionTest.java
index 937a7add0da..217aeb61ee6 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/component/ws/ComponentAppActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/component/ws/ComponentAppActionTest.java
@@ -159,7 +159,7 @@ public class ComponentAppActionTest {
       .setName("Plugin.java")
       .setLongName("src/main/java/org/sonar/api/Plugin.java")
       .setPath("src/main/java/org/sonar/api/Plugin.java")
-      .setSubProjectId(5L);
+      .setParentProjectId(5L);
     when(componentDao.getNullableByKey(session, COMPONENT_KEY)).thenReturn(file);
     when(componentDao.getById(5L, session)).thenReturn(new ComponentDto().setId(5L).setLongName("SonarQube :: Plugin API").setKey(SUB_PROJECT_KEY));
     when(componentDao.getByUuid(session, project.uuid())).thenReturn(project);
@@ -192,7 +192,7 @@ public class ComponentAppActionTest {
       .setName("Plugin.java")
       .setLongName(null)
       .setPath("src/main/java/org/sonar/api/Plugin.java")
-      .setSubProjectId(1L);
+      .setParentProjectId(1L);
     when(componentDao.getNullableByKey(session, COMPONENT_KEY)).thenReturn(file);
     when(componentDao.getById(project.getId(), session)).thenReturn(project);
     when(componentDao.getByUuid(session, project.uuid())).thenReturn(project);
@@ -328,7 +328,7 @@ public class ComponentAppActionTest {
       .setLongName(null)
       .setKey(componentKey).setName("PlanActionTest.java")
       .setPath("src/test/java/org/sonar/server/issue/PlanActionTest.java")
-      .setSubProjectId(5L);
+      .setParentProjectId(5L);
     when(componentDao.getNullableByKey(session, componentKey)).thenReturn(file);
     when(componentDao.getById(5L, session)).thenReturn(new ComponentDto().setId(5L).setLongName("SonarQube :: Plugin API").setKey(SUB_PROJECT_KEY));
     when(componentDao.getByUuid(session, project.uuid())).thenReturn(project);
@@ -505,7 +505,7 @@ public class ComponentAppActionTest {
       .setName("Plugin.java")
       .setLongName("src/main/java/org/sonar/api/Plugin.java")
       .setPath("src/main/java/org/sonar/api/Plugin.java")
-      .setSubProjectId(5L);
+      .setParentProjectId(5L);
     when(componentDao.getNullableByKey(session, COMPONENT_KEY)).thenReturn(file);
     when(componentDao.getById(5L, session)).thenReturn(new ComponentDto().setId(5L).setLongName("SonarQube :: Plugin API").setKey(SUB_PROJECT_KEY));
     when(componentDao.getByUuid(session, project.uuid())).thenReturn(project);
diff --git a/server/sonar-server/src/test/java/org/sonar/server/duplication/ws/DuplicationsJsonWriterTest.java b/server/sonar-server/src/test/java/org/sonar/server/duplication/ws/DuplicationsJsonWriterTest.java
index c5c869c98e5..65b3ac7f3b9 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/duplication/ws/DuplicationsJsonWriterTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/duplication/ws/DuplicationsJsonWriterTest.java
@@ -69,9 +69,9 @@ public class DuplicationsJsonWriterTest {
   @Test
   public void write_duplications() throws Exception {
     String key1 = "org.codehaus.sonar:sonar-ws-client:src/main/java/org/sonar/wsclient/services/PropertyDeleteQuery.java";
-    ComponentDto file1 = ComponentTesting.newFileDto(project).setId(10L).setKey(key1).setLongName("PropertyDeleteQuery").setSubProjectId(5L);
+    ComponentDto file1 = ComponentTesting.newFileDto(project).setId(10L).setKey(key1).setLongName("PropertyDeleteQuery").setParentProjectId(5L);
     String key2 = "org.codehaus.sonar:sonar-ws-client:src/main/java/org/sonar/wsclient/services/PropertyUpdateQuery.java";
-    ComponentDto file2 = ComponentTesting.newFileDto(project).setId(11L).setQualifier("FIL").setKey(key2).setLongName("PropertyUpdateQuery").setSubProjectId(5L);
+    ComponentDto file2 = ComponentTesting.newFileDto(project).setId(11L).setQualifier("FIL").setKey(key2).setLongName("PropertyUpdateQuery").setParentProjectId(5L);
 
     when(componentDao.getNullableByKey(session, key1)).thenReturn(file1);
     when(componentDao.getNullableByKey(session, key2)).thenReturn(file2);
diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/IssueBulkChangeServiceTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/IssueBulkChangeServiceTest.java
index a4853c54f25..147efc9ac91 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/issue/IssueBulkChangeServiceTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/issue/IssueBulkChangeServiceTest.java
@@ -103,7 +103,7 @@ public class IssueBulkChangeServiceTest {
 
     file = new ComponentDto()
       .setId(2L)
-      .setSubProjectId(project.getId())
+      .setParentProjectId(project.getId())
       .setKey("MyComponent")
       .setLongName("My Component");
     when(componentDao.getByKeys(dbSession, newHashSet(file.key()))).thenReturn(newArrayList(file));
diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/IssueShowActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/IssueShowActionTest.java
index 2a52d832206..b46bee36bcb 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/IssueShowActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/IssueShowActionTest.java
@@ -164,7 +164,7 @@ public class IssueShowActionTest {
       .setLongName("SonarQube :: Issue Client")
       .setName("SonarQube :: Issue Client")
       .setQualifier("FIL")
-      .setSubProjectId(1L);
+      .setParentProjectId(1L);
     when(componentDao.getByUuid(session, file.uuid())).thenReturn(file);
 
     DefaultIssue issue = new DefaultIssue()
@@ -204,7 +204,7 @@ public class IssueShowActionTest {
       .setKey("org.sonar.server.Server")
       .setLongName("SonarQube :: Server")
       .setQualifier("BRC")
-      .setSubProjectId(1L);
+      .setParentProjectId(1L);
     when(componentDao.getNullableById(module.getId(), session)).thenReturn(module);
 
     // File
@@ -213,7 +213,7 @@ public class IssueShowActionTest {
       .setKey("org.sonar.server.issue.IssueClient")
       .setLongName("SonarQube :: Issue Client")
       .setQualifier("FIL")
-      .setSubProjectId(2L);
+      .setParentProjectId(2L);
     when(componentDao.getByUuid(session, file.uuid())).thenReturn(file);
 
     DefaultIssue issue = new DefaultIssue()
@@ -256,7 +256,7 @@ public class IssueShowActionTest {
       .setName("SonarQube :: Server")
       .setLongName(null)
       .setQualifier("BRC")
-      .setSubProjectId(1L);
+      .setParentProjectId(1L);
     when(componentDao.getNullableById(module.getId(), session)).thenReturn(module);
 
     // File
@@ -265,7 +265,7 @@ public class IssueShowActionTest {
       .setKey("org.sonar.server.issue.IssueClient")
       .setLongName("SonarQube :: Issue Client")
       .setQualifier("FIL")
-      .setSubProjectId(2L);
+      .setParentProjectId(2L);
     when(componentDao.getByUuid(session, file.uuid())).thenReturn(file);
 
     DefaultIssue issue = new DefaultIssue()
@@ -308,7 +308,7 @@ public class IssueShowActionTest {
       .setLongName("SonarQube :: Issue Client")
       .setName("SonarQube :: Issue Client")
       .setQualifier("FIL")
-      .setSubProjectId(1L);
+      .setParentProjectId(1L);
     when(componentDao.getByUuid(session, file.uuid())).thenReturn(file);
 
     DefaultIssue issue = createIssue()
@@ -515,7 +515,7 @@ public class IssueShowActionTest {
       .setLongName("SonarQube :: Issue Client")
       .setName("SonarQube :: Issue Client")
       .setQualifier("FIL")
-      .setSubProjectId(1L);
+      .setParentProjectId(1L);
     when(componentDao.getByUuid(session, file.uuid())).thenReturn(file);
 
     return createIssue()
diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SearchActionMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SearchActionMediumTest.java
index 6a55d17b8e7..4b92db9fe77 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SearchActionMediumTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SearchActionMediumTest.java
@@ -98,7 +98,7 @@ public class SearchActionMediumTest {
 
     file = ComponentTesting.newFileDto(project).setUuid("BCDE")
       .setKey("MyComponent")
-      .setSubProjectId(project.getId());
+      .setParentProjectId(project.getId());
     db.componentDao().insert(session, file);
     SnapshotDto snapshot = db.snapshotDao().insert(session, SnapshotTesting.createForComponent(file, project));
     SnapshotSourceDto snapshotSource = new SnapshotSourceDto().setSnapshotId(snapshot.getId()).setData("First Line\n"
@@ -110,7 +110,7 @@ public class SearchActionMediumTest {
 
     otherFile = ComponentTesting.newFileDto(project).setUuid("FEDC")
       .setKey("OtherComponent")
-      .setSubProjectId(project.getId());
+      .setParentProjectId(project.getId());
     db.componentDao().insert(session, otherFile);
     snapshot = db.snapshotDao().insert(session, SnapshotTesting.createForComponent(otherFile, project));
     snapshotSource = new SnapshotSourceDto().setSnapshotId(snapshot.getId()).setData("First Line\n"
@@ -205,7 +205,7 @@ public class SearchActionMediumTest {
 
     ComponentDto file2 = ComponentTesting.newFileDto(project2).setUuid("EDCB")
       .setKey("MyComponent2")
-      .setSubProjectId(project2.getId());
+      .setParentProjectId(project2.getId());
     db.componentDao().insert(session, file2);
 
     IssueDto issue2 = IssueTesting.newDto(rule, file2, project2)
@@ -316,7 +316,7 @@ public class SearchActionMediumTest {
     ComponentDto removedFile = ComponentTesting.newFileDto(project).setUuid("EDCB")
       .setEnabled(false)
       .setKey("RemovedComponent")
-      .setSubProjectId(project.getId());
+      .setParentProjectId(project.getId());
     db.componentDao().insert(session, removedFile);
 
     IssueDto issue = IssueTesting.newDto(rule, removedFile, project)
@@ -430,7 +430,7 @@ public class SearchActionMediumTest {
 
     ComponentDto module = ComponentTesting.newFileDto(project).setKey("ModuleHavingFile")
       .setScope("PRJ")
-      .setSubProjectId(project.getId());
+      .setParentProjectId(project.getId());
     db.componentDao().insert(session, module);
     db.snapshotDao().insert(session, SnapshotTesting.createForComponent(module, project));
 
diff --git a/sonar-core/src/main/java/org/sonar/core/component/ComponentDto.java b/sonar-core/src/main/java/org/sonar/core/component/ComponentDto.java
index 9d1389309a6..94e50ab5acc 100644
--- a/sonar-core/src/main/java/org/sonar/core/component/ComponentDto.java
+++ b/sonar-core/src/main/java/org/sonar/core/component/ComponentDto.java
@@ -44,7 +44,7 @@ public class ComponentDto extends Dto<String> implements Component {
   private String name;
   private String longName;
   private String language;
-  private Long subProjectId;
+  private Long parentProjectId;
   private boolean enabled = true;
   private Long authorizationUpdatedAt;
 
@@ -180,12 +180,12 @@ public class ComponentDto extends Dto<String> implements Component {
   }
 
   @CheckForNull
-  public Long subProjectId() {
-    return subProjectId;
+  public Long parentProjectId() {
+    return parentProjectId;
   }
 
-  public ComponentDto setSubProjectId(@Nullable Long subProjectId) {
-    this.subProjectId = subProjectId;
+  public ComponentDto setParentProjectId(@Nullable Long parentProjectId) {
+    this.parentProjectId = parentProjectId;
     return this;
   }
 
diff --git a/sonar-core/src/main/resources/org/sonar/core/component/db/ComponentMapper.xml b/sonar-core/src/main/resources/org/sonar/core/component/db/ComponentMapper.xml
index 3d643d6ba73..685f8e42d40 100644
--- a/sonar-core/src/main/resources/org/sonar/core/component/db/ComponentMapper.xml
+++ b/sonar-core/src/main/resources/org/sonar/core/component/db/ComponentMapper.xml
@@ -15,7 +15,7 @@
     p.qualifier as qualifier,
     p.scope as scope,
     p.language as language,
-    p.root_id as subProjectId,
+    p.root_id as parentProjectId,
     p.path as path,
     p.enabled as enabled,
     p.authorization_updated_at as authorizationUpdatedAt,
@@ -149,7 +149,7 @@
   <insert id="insert" parameterType="Component" keyColumn="id" useGeneratedKeys="true" keyProperty="id">
     insert into projects <include refid="insertColumns"/>
     values (#{kee}, #{deprecatedKey}, #{uuid}, #{projectUuid}, #{moduleUuid}, #{moduleUuidPath}, #{name}, #{longName}, #{qualifier}, #{scope},
-      #{language}, #{subProjectId}, #{path}, #{enabled}, #{createdAt}, #{authorizationUpdatedAt})
+      #{language}, #{parentProjectId}, #{path}, #{enabled}, #{createdAt}, #{authorizationUpdatedAt})
   </insert>
 
   <delete id="deleteByKey" parameterType="String">
diff --git a/sonar-core/src/test/java/org/sonar/core/component/ComponentDtoTest.java b/sonar-core/src/test/java/org/sonar/core/component/ComponentDtoTest.java
index 2816c20843b..e54956f50e3 100644
--- a/sonar-core/src/test/java/org/sonar/core/component/ComponentDtoTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/component/ComponentDtoTest.java
@@ -38,7 +38,7 @@ public class ComponentDtoTest {
       .setScope("FIL")
       .setLanguage("java")
       .setPath("src/org/struts/RequestContext.java")
-      .setSubProjectId(3L)
+      .setParentProjectId(3L)
       .setAuthorizationUpdatedAt(123456789L);
 
     assertThat(componentDto.getId()).isEqualTo(1L);
@@ -50,7 +50,7 @@ public class ComponentDtoTest {
     assertThat(componentDto.scope()).isEqualTo("FIL");
     assertThat(componentDto.path()).isEqualTo("src/org/struts/RequestContext.java");
     assertThat(componentDto.language()).isEqualTo("java");
-    assertThat(componentDto.subProjectId()).isEqualTo(3L);
+    assertThat(componentDto.parentProjectId()).isEqualTo(3L);
     assertThat(componentDto.getAuthorizationUpdatedAt()).isEqualTo(123456789L);
   }