@@ -27,21 +27,21 @@ import static java.util.Objects.requireNonNull; | |||
@Immutable | |||
public class ProjectViewAttributes { | |||
private final String projectUuid; | |||
private final String uuid; | |||
private final String originalKey; | |||
@CheckForNull | |||
private final Long analysisDate; | |||
private final String branchName; | |||
public ProjectViewAttributes(String projectUuid, String originalKey, @Nullable Long analysisDate, @Nullable String branchName) { | |||
this.projectUuid = requireNonNull(projectUuid, "projectUuid can't be null"); | |||
this.originalKey = requireNonNull(originalKey, "projectKey can't be null"); | |||
public ProjectViewAttributes(String uuid, String originalKey, @Nullable Long analysisDate, @Nullable String branchName) { | |||
this.uuid = requireNonNull(uuid, "uuid can't be null"); | |||
this.originalKey = requireNonNull(originalKey, "originalKey can't be null"); | |||
this.analysisDate = analysisDate; | |||
this.branchName = branchName; | |||
} | |||
public String getProjectUuid() { | |||
return projectUuid; | |||
public String getUuid() { | |||
return uuid; | |||
} | |||
@CheckForNull | |||
@@ -49,7 +49,6 @@ public class ProjectViewAttributes { | |||
return analysisDate; | |||
} | |||
public String getBranchName() { | |||
return branchName; | |||
} | |||
@@ -61,7 +60,7 @@ public class ProjectViewAttributes { | |||
@Override | |||
public String toString() { | |||
return "ProjectViewAttributes{" + | |||
", projectUuid='" + projectUuid + '\'' + | |||
", uuid='" + uuid + '\'' + | |||
", branchName='" + branchName + '\'' + | |||
", analysisDate=" + analysisDate + | |||
'}'; |
@@ -340,7 +340,7 @@ public class PersistComponentsStep implements ComputationStep { | |||
res.setQualifier(PROJECT); | |||
res.setName(projectView.getName()); | |||
res.setLongName(res.name()); | |||
res.setCopyComponentUuid(projectView.getProjectViewAttributes().getProjectUuid()); | |||
res.setCopyComponentUuid(projectView.getProjectViewAttributes().getUuid()); | |||
setRootAndParentModule(res, path); | |||
@@ -395,7 +395,7 @@ public class PersistComponentsStep implements ComputationStep { | |||
} | |||
private static Optional<ComponentUpdateDto> compareForUpdate(ComponentDto existing, ComponentDto target) { | |||
boolean hasDifferences = !StringUtils.equals(existing.getCopyResourceUuid(), target.getCopyResourceUuid()) || | |||
boolean hasDifferences = !StringUtils.equals(existing.getCopyComponentUuid(), target.getCopyComponentUuid()) || | |||
!StringUtils.equals(existing.description(), target.description()) || | |||
!StringUtils.equals(existing.getDbKey(), target.getDbKey()) || | |||
!existing.isEnabled() || |
@@ -207,7 +207,7 @@ public class ViewsPersistComponentsStepTest extends BaseStepTest { | |||
assertRowsCountInTableProjects(2); | |||
ComponentDto subView = getComponentFromDb(SUBVIEW_1_KEY); | |||
assertThat(subView.getCopyResourceUuid()).isEqualTo("ORIGINAL_UUID"); | |||
assertThat(subView.getCopyComponentUuid()).isEqualTo("ORIGINAL_UUID"); | |||
} | |||
@Test | |||
@@ -368,7 +368,7 @@ public class ViewsPersistComponentsStepTest extends BaseStepTest { | |||
dbTester.commit(); | |||
ComponentDto subViewReloaded = getComponentFromDb(SUBVIEW_1_KEY); | |||
assertThat(subViewReloaded.getCopyResourceUuid()).isEqualTo("NEW_COPY"); | |||
assertThat(subViewReloaded.getCopyComponentUuid()).isEqualTo("NEW_COPY"); | |||
} | |||
@Test | |||
@@ -504,7 +504,7 @@ public class ViewsPersistComponentsStepTest extends BaseStepTest { | |||
assertThat(dto.moduleUuidPath()).isEqualTo("." + dto.uuid() + "."); | |||
assertThat(dto.qualifier()).isEqualTo(Qualifiers.VIEW); | |||
assertThat(dto.scope()).isEqualTo(Scopes.PROJECT); | |||
assertThat(dto.getCopyResourceUuid()).isNull(); | |||
assertThat(dto.getCopyComponentUuid()).isNull(); | |||
assertThat(dto.getCreatedAt()).isEqualTo(now); | |||
} | |||
@@ -523,7 +523,7 @@ public class ViewsPersistComponentsStepTest extends BaseStepTest { | |||
assertThat(dto.moduleUuidPath()).isEqualTo("." + dto.uuid() + "."); | |||
assertThat(dto.qualifier()).isEqualTo(Qualifiers.APP); | |||
assertThat(dto.scope()).isEqualTo(Scopes.PROJECT); | |||
assertThat(dto.getCopyResourceUuid()).isNull(); | |||
assertThat(dto.getCopyComponentUuid()).isNull(); | |||
assertThat(dto.getCreatedAt()).isEqualTo(now); | |||
} | |||
@@ -542,7 +542,7 @@ public class ViewsPersistComponentsStepTest extends BaseStepTest { | |||
assertThat(sv1Dto.moduleUuidPath()).isEqualTo(viewDto.moduleUuidPath() + sv1Dto.uuid() + "."); | |||
assertThat(sv1Dto.qualifier()).isEqualTo(Qualifiers.SUBVIEW); | |||
assertThat(sv1Dto.scope()).isEqualTo(Scopes.PROJECT); | |||
assertThat(sv1Dto.getCopyResourceUuid()).isNull(); | |||
assertThat(sv1Dto.getCopyComponentUuid()).isNull(); | |||
assertThat(sv1Dto.getCreatedAt()).isEqualTo(now); | |||
} | |||
@@ -558,7 +558,7 @@ public class ViewsPersistComponentsStepTest extends BaseStepTest { | |||
assertThat(pv1Dto.moduleUuidPath()).isEqualTo(parentViewDto.moduleUuidPath() + pv1Dto.uuid() + "."); | |||
assertThat(pv1Dto.qualifier()).isEqualTo(Qualifiers.PROJECT); | |||
assertThat(pv1Dto.scope()).isEqualTo(Scopes.FILE); | |||
assertThat(pv1Dto.getCopyResourceUuid()).isEqualTo(project.uuid()); | |||
assertThat(pv1Dto.getCopyComponentUuid()).isEqualTo(project.uuid()); | |||
assertThat(pv1Dto.getCreatedAt()).isEqualTo(now); | |||
} | |||
@@ -352,7 +352,7 @@ public class ComponentDto { | |||
} | |||
@CheckForNull | |||
public String getCopyResourceUuid() { | |||
public String getCopyComponentUuid() { | |||
return copyComponentUuid; | |||
} | |||
@@ -189,7 +189,7 @@ public class ComponentUpdateDto { | |||
.setUuid(from.uuid()) | |||
.setBChanged(false) | |||
.setBKey(from.getDbKey()) | |||
.setBCopyComponentUuid(from.getCopyResourceUuid()) | |||
.setBCopyComponentUuid(from.getCopyComponentUuid()) | |||
.setBDescription(from.description()) | |||
.setBEnabled(from.isEnabled()) | |||
.setBUuidPath(from.getUuidPath()) |
@@ -149,7 +149,7 @@ public class ComponentDaoTest { | |||
assertThat(result.qualifier()).isEqualTo("TRK"); | |||
assertThat(result.scope()).isEqualTo("PRJ"); | |||
assertThat(result.language()).isNull(); | |||
assertThat(result.getCopyResourceUuid()).isNull(); | |||
assertThat(result.getCopyComponentUuid()).isNull(); | |||
assertThat(result.isPrivate()).isTrue(); | |||
assertThat(underTest.selectByUuid(dbSession, "UNKNOWN")).isEmpty(); | |||
@@ -178,7 +178,7 @@ public class ComponentDaoTest { | |||
assertThat(result.qualifier()).isEqualTo("TRK"); | |||
assertThat(result.scope()).isEqualTo("FIL"); | |||
assertThat(result.language()).isNull(); | |||
assertThat(result.getCopyResourceUuid()).isEqualTo(project.uuid()); | |||
assertThat(result.getCopyComponentUuid()).isEqualTo(project.uuid()); | |||
assertThat(result.isPrivate()).isFalse(); | |||
} | |||
@@ -1272,7 +1272,7 @@ public class ComponentDaoTest { | |||
Map<String, Object> row1 = selectBColumnsForUuid("U1"); | |||
assertThat(row1.get("bChanged")).isIn(true, /* for Oracle */1L, 1); | |||
assertThat(row1.get("bKey")).isEqualTo(dto1.getDbKey()); | |||
assertThat(row1.get("bCopyComponentUuid")).isEqualTo(dto1.getCopyResourceUuid()); | |||
assertThat(row1.get("bCopyComponentUuid")).isEqualTo(dto1.getCopyComponentUuid()); | |||
assertThat(row1.get("bDescription")).isEqualTo(dto1.description()); | |||
assertThat(row1.get("bEnabled")).isIn(false, /* for Oracle */0L, 0); | |||
assertThat(row1.get("bUuidPath")).isEqualTo(dto1.getUuidPath()); | |||
@@ -1287,7 +1287,7 @@ public class ComponentDaoTest { | |||
Map<String, Object> row2 = selectBColumnsForUuid("U2"); | |||
assertThat(row2.get("bChanged")).isIn(true, /* for Oracle */1L, 1); | |||
assertThat(row2.get("bKey")).isEqualTo(dto2.getDbKey()); | |||
assertThat(row2.get("bCopyComponentUuid")).isEqualTo(dto2.getCopyResourceUuid()); | |||
assertThat(row2.get("bCopyComponentUuid")).isEqualTo(dto2.getCopyComponentUuid()); | |||
assertThat(row2.get("bDescription")).isEqualTo(dto2.description()); | |||
assertThat(row2.get("bEnabled")).isIn(false, /* for Oracle */0L, 0); | |||
assertThat(row2.get("bUuidPath")).isEqualTo(dto2.getUuidPath()); |
@@ -51,7 +51,7 @@ public class ComponentDtoTest { | |||
assertThat(componentDto.language()).isEqualTo("java"); | |||
assertThat(componentDto.description()).isEqualTo("desc"); | |||
assertThat(componentDto.getRootUuid()).isEqualTo("uuid_3"); | |||
assertThat(componentDto.getCopyResourceUuid()).isEqualTo("uuid_5"); | |||
assertThat(componentDto.getCopyComponentUuid()).isEqualTo("uuid_5"); | |||
assertThat(componentDto.isPrivate()).isFalse(); | |||
} | |||
@@ -198,7 +198,7 @@ public class TreeAction implements ComponentsWsAction { | |||
private Map<String, ComponentDto> searchReferenceComponentsByUuid(DbSession dbSession, List<ComponentDto> components) { | |||
List<String> referenceComponentIds = components.stream() | |||
.map(ComponentDto::getCopyResourceUuid) | |||
.map(ComponentDto::getCopyComponentUuid) | |||
.filter(Objects::nonNull) | |||
.collect(toList()); | |||
if (referenceComponentIds.isEmpty()) { | |||
@@ -244,7 +244,7 @@ public class TreeAction implements ComponentsWsAction { | |||
wsComponent = componentDtoToWsComponent(component, parentProject.orElse(null), null); | |||
} | |||
ComponentDto referenceComponent = referenceComponentsByUuid.get(component.getCopyResourceUuid()); | |||
ComponentDto referenceComponent = referenceComponentsByUuid.get(component.getCopyComponentUuid()); | |||
if (referenceComponent != null) { | |||
wsComponent.setRefId(referenceComponent.uuid()); | |||
wsComponent.setRefKey(referenceComponent.getKey()); |
@@ -231,11 +231,11 @@ public class ComponentAction implements MeasuresWsAction { | |||
} | |||
private Optional<ComponentDto> getReferenceComponent(DbSession dbSession, ComponentDto component) { | |||
if (component.getCopyResourceUuid() == null) { | |||
if (component.getCopyComponentUuid() == null) { | |||
return Optional.empty(); | |||
} | |||
return dbClient.componentDao().selectByUuid(dbSession, component.getCopyResourceUuid()); | |||
return dbClient.componentDao().selectByUuid(dbSession, component.getCopyComponentUuid()); | |||
} | |||
private static ComponentWsResponse buildResponse(ComponentRequest request, ComponentDto component, Optional<ComponentDto> refComponent, |
@@ -37,7 +37,7 @@ class ComponentDtoToWsComponent { | |||
Map<String, ComponentDto> referenceComponentsByUuid) { | |||
Component.Builder wsComponent = componentDtoToWsComponent(component); | |||
ComponentDto referenceComponent = referenceComponentsByUuid.get(component.getCopyResourceUuid()); | |||
ComponentDto referenceComponent = referenceComponentsByUuid.get(component.getCopyComponentUuid()); | |||
if (referenceComponent != null) { | |||
wsComponent.setRefKey(referenceComponent.getDbKey()); | |||
} |
@@ -371,7 +371,7 @@ public class ComponentTreeAction implements MeasuresWsAction { | |||
private static Measures.Component.Builder toWsComponent(ComponentDto component, Map<MetricDto, ComponentTreeData.Measure> measures, | |||
Map<String, ComponentDto> referenceComponentsByUuid) { | |||
Measures.Component.Builder wsComponent = componentDtoToWsComponent(component); | |||
ComponentDto referenceComponent = referenceComponentsByUuid.get(component.getCopyResourceUuid()); | |||
ComponentDto referenceComponent = referenceComponentsByUuid.get(component.getCopyComponentUuid()); | |||
if (referenceComponent != null) { | |||
wsComponent.setRefKey(referenceComponent.getKey()); | |||
String displayQualifier = getDisplayQualifier(component, referenceComponent); | |||
@@ -463,7 +463,7 @@ public class ComponentTreeAction implements MeasuresWsAction { | |||
private Map<String, ComponentDto> searchReferenceComponentsById(DbSession dbSession, List<ComponentDto> components) { | |||
List<String> referenceComponentUUids = components.stream() | |||
.map(ComponentDto::getCopyResourceUuid) | |||
.map(ComponentDto::getCopyComponentUuid) | |||
.filter(Objects::nonNull) | |||
.collect(MoreCollectors.toList(components.size())); | |||
if (referenceComponentUUids.isEmpty()) { |