* @throws IllegalStateException if the Component's type is not {@link Type#PROJECT_VIEW}
*/
ProjectViewAttributes getProjectViewAttributes();
+
+ /**
+ * The attributes of the Component if it's type is {@link Type#SUBVIEW}.
+ *
+ * @throws IllegalStateException if the Component's type is not {@link Type#SUBVIEW}
+ */
+ SubViewAttributes getSubViewAttributes();
}
@Override
public ProjectViewAttributes getProjectViewAttributes() {
- throw new IllegalStateException("Only component of type PROJECT_VIEW have a FileAttributes object");
+ throw new IllegalStateException("Only component of type PROJECT_VIEW have a ProjectViewAttributes object");
+ }
+
+ @Override
+ public SubViewAttributes getSubViewAttributes() {
+ throw new IllegalStateException("Only component of type SUBVIEW have a SubViewAttributes object");
}
public static Builder builder(Type type) {
private FileAttributes fileAttributes;
private final List<Component> children = new ArrayList<>();
- private Builder(Type type){
+ private Builder(Type type) {
this.type = requireNonNull(type, "type can't be null");
}
return this;
}
- public Builder setFileAttributes(@Nullable FileAttributes fileAttributes) {
+ public Builder setFileAttributes(@Nullable FileAttributes fileAttributes) {
this.fileAttributes = fileAttributes;
return this;
}
--- /dev/null
+/*
+ * SonarQube
+ * Copyright (C) 2009-2017 SonarSource SA
+ * mailto:info AT sonarsource DOT com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+package org.sonar.server.computation.task.projectanalysis.component;
+
+import javax.annotation.CheckForNull;
+import javax.annotation.Nullable;
+import javax.annotation.concurrent.Immutable;
+
+@Immutable
+public class SubViewAttributes {
+ private final String originalViewUuid;
+
+ public SubViewAttributes(@Nullable String originalViewUuid) {
+ this.originalViewUuid = originalViewUuid;
+ }
+
+ /**
+ * Return the original view uuid when the sub view is a local view
+ */
+ @CheckForNull
+ public String getOriginalViewUuid() {
+ return originalViewUuid;
+ }
+
+ @Override
+ public String toString() {
+ return "SubViewAttributes{" +
+ "originalViewUuid='" + originalViewUuid + '\'' +
+ '}';
+ }
+}
res.setName(subView.getName());
res.setDescription(subView.getDescription());
res.setLongName(res.name());
+ res.setCopyComponentUuid(subView.getSubViewAttributes().getOriginalViewUuid());
setRootAndParentModule(res, path);
});
}
+ @Test
+ public void getSubViewAttributes_throws_ISE_if_component_is_not_have_type_SUBVIEW() {
+ Arrays.stream(Component.Type.values())
+ .filter(type -> type != FILE)
+ .forEach((componentType) -> {
+ ComponentImpl component = buildSimpleComponent(componentType, componentType.name()).build();
+ try {
+ component.getSubViewAttributes();
+ fail("A IllegalStateException should have been raised");
+ } catch (IllegalStateException e) {
+ assertThat(e).hasMessage("Only component of type SUBVIEW have a SubViewAttributes object");
+ }
+ });
+ }
+
@Test
public void isUnitTest_returns_true_if_IsTest_is_set_in_BatchComponent() {
ComponentImpl component = buildSimpleComponent(FILE, "file").setFileAttributes(new FileAttributes(true, null, 1)).build();
throw new IllegalStateException("Only component of type PROJECT_VIEW can have a ProjectViewAttributes object");
}
+ @Override
+ public SubViewAttributes getSubViewAttributes() {
+ throw new IllegalStateException("Only component of type SUBVIEW have a SubViewAttributes object");
+ }
+
@Override
public boolean equals(@Nullable Object o) {
if (this == o) {
private final List<Component> children;
@CheckForNull
private final ProjectViewAttributes projectViewAttributes;
+ @CheckForNull
+ private final SubViewAttributes subViewAttributes;
private ViewsComponent(Type type, String key, @Nullable String uuid, @Nullable String name, @Nullable String description,
List<Component> children,
- @Nullable ProjectViewAttributes projectViewAttributes) {
+ @Nullable ProjectViewAttributes projectViewAttributes, @Nullable SubViewAttributes subViewAttributes) {
checkArgument(type.isViewsType(), "Component type must be a Views type");
this.type = type;
this.key = requireNonNull(key);
this.description = description;
this.children = ImmutableList.copyOf(children);
this.projectViewAttributes = projectViewAttributes;
+ this.subViewAttributes = subViewAttributes;
}
public static Builder builder(Type type, String key) {
private List<Component> children = new ArrayList<>();
@CheckForNull
private ProjectViewAttributes projectViewAttributes;
+ @CheckForNull
+ private SubViewAttributes subViewAttributes;
private Builder(Type type, String key) {
this.type = type;
return this;
}
+ public Builder setSubViewAttributes(@Nullable SubViewAttributes subViewAttributes) {
+ this.subViewAttributes = subViewAttributes;
+ return this;
+ }
+
public Builder addChildren(Component... c) {
for (Component viewsComponent : c) {
checkArgument(viewsComponent.getType().isViewsType());
}
public ViewsComponent build() {
- return new ViewsComponent(type, key, uuid, name, description, children, projectViewAttributes);
+ return new ViewsComponent(type, key, uuid, name, description, children, projectViewAttributes, subViewAttributes);
}
}
return this.projectViewAttributes;
}
+ @Override
+ public SubViewAttributes getSubViewAttributes() {
+ checkState(this.type != Type.SUBVIEW || this.subViewAttributes != null, "A SubViewAttributes object should have been set");
+ return this.subViewAttributes;
+ }
+
@Override
public String toString() {
return "ViewsComponent{" +
", name='" + name + '\'' +
", children=" + children +
", projectViewAttributes=" + projectViewAttributes +
+ ", subViewAttributes=" + subViewAttributes +
'}';
}
import java.text.SimpleDateFormat;
import java.util.Date;
+import javax.annotation.Nullable;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.sonar.server.computation.task.projectanalysis.component.MutableDbIdsRepositoryRule;
import org.sonar.server.computation.task.projectanalysis.component.MutableDisabledComponentsHolder;
import org.sonar.server.computation.task.projectanalysis.component.ProjectViewAttributes;
+import org.sonar.server.computation.task.projectanalysis.component.SubViewAttributes;
import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule;
import org.sonar.server.computation.task.projectanalysis.component.ViewsComponent;
import org.sonar.server.computation.task.step.ComputationStep;
treeRootHolder.setRoot(
createViewBuilder()
.addChildren(
- createSubView1Builder().build())
+ createSubView1Builder(null).build())
.build());
underTest.execute();
assertDtoIsSubView1(viewDto, sv1Dto);
}
+ @Test
+ public void persist_empty_subview_having_original_view_uuid() {
+ treeRootHolder.setRoot(
+ createViewBuilder()
+ .addChildren(
+ createSubView1Builder("ORIGINAL_UUID").build())
+ .build());
+
+ underTest.execute();
+
+ assertRowsCountInTableProjects(2);
+
+ ComponentDto subView = getComponentFromDb(SUBVIEW_1_KEY);
+ assertThat(subView.getCopyResourceUuid()).isEqualTo("ORIGINAL_UUID");
+ }
+
@Test
public void persist_existing_empty_subview_under_existing_view() {
ComponentDto viewDto = newViewDto(dbTester.organizations().insert());
treeRootHolder.setRoot(
createViewBuilder()
.addChildren(
- createSubView1Builder().build())
+ createSubView1Builder(null).build())
.build());
underTest.execute();
treeRootHolder.setRoot(
createViewBuilder()
.addChildren(
- createSubView1Builder().build())
+ createSubView1Builder(null).build())
.build());
underTest.execute();
treeRootHolder.setRoot(
createViewBuilder()
.addChildren(
- createSubView1Builder()
+ createSubView1Builder(null)
.addChildren(
createProjectView1Builder(project, null).build())
.build())
assertDtoIsProjectView1(pv1Dto, view, view, project2);
}
+ @Test
+ public void update_copy_component_uuid_of_sub_view() {
+ OrganizationDto organizationDto = dbTester.organizations().insert();
+ ComponentDto view = newViewDto(organizationDto);
+ ComponentDto subView = newSubViewDto(view).setCopyComponentUuid("OLD_COPY");
+ persistComponents(view, subView);
+
+ treeRootHolder.setRoot(
+ createViewBuilder()
+ .addChildren(
+ createSubView1Builder("NEW_COPY").build())
+ .build());
+
+ underTest.execute();
+
+ // commit functional transaction -> copies B-fields to A-fields
+ dbClient.componentDao().applyBChangesForRootComponentUuid(dbTester.getSession(), view.uuid());
+ dbTester.commit();
+
+ ComponentDto subViewReloaded = getComponentFromDb(SUBVIEW_1_KEY);
+ assertThat(subViewReloaded.getCopyResourceUuid()).isEqualTo("NEW_COPY");
+ }
+
private static ViewsComponent.Builder createViewBuilder() {
- return builder(VIEW, VIEW_KEY).setUuid(VIEW_UUID).setName(VIEW_NAME).setDescription(VIEW_DESCRIPTION);
+ return builder(VIEW, VIEW_KEY)
+ .setUuid(VIEW_UUID)
+ .setName(VIEW_NAME)
+ .setDescription(VIEW_DESCRIPTION);
}
- private ViewsComponent.Builder createSubView1Builder() {
- return builder(SUBVIEW, SUBVIEW_1_KEY).setUuid(SUBVIEW_1_UUID).setName(SUBVIEW_1_NAME).setDescription(SUBVIEW_1_DESCRIPTION);
+ private ViewsComponent.Builder createSubView1Builder(@Nullable String originalViewUuid) {
+ return builder(SUBVIEW, SUBVIEW_1_KEY)
+ .setUuid(SUBVIEW_1_UUID)
+ .setName(SUBVIEW_1_NAME)
+ .setDescription(SUBVIEW_1_DESCRIPTION)
+ .setSubViewAttributes(new SubViewAttributes(originalViewUuid));
}
private static ViewsComponent.Builder createProjectView1Builder(ComponentDto project, Long analysisDate) {
.setName(VIEW_NAME);
}
+ private ComponentDto newSubViewDto(ComponentDto rootView) {
+ return ComponentTesting.newSubView(rootView, SUBVIEW_1_UUID, SUBVIEW_1_KEY)
+ .setName(SUBVIEW_1_NAME);
+ }
+
/**
* Assertions to verify the DTO created from {@link #createViewBuilder()}
*/
projects / sonarqube.git / commitdiff