diff options
23 files changed, 171 insertions, 143 deletions
diff --git a/server/sonar-server-benchmarks/src/test/java/org/sonar/server/benchmark/PersistFileSourcesStepTest.java b/server/sonar-server-benchmarks/src/test/java/org/sonar/server/benchmark/PersistFileSourcesStepTest.java index 8074d8204af..c575faa0d95 100644 --- a/server/sonar-server-benchmarks/src/test/java/org/sonar/server/benchmark/PersistFileSourcesStepTest.java +++ b/server/sonar-server-benchmarks/src/test/java/org/sonar/server/benchmark/PersistFileSourcesStepTest.java @@ -110,7 +110,7 @@ public class PersistFileSourcesStepTest { components.add(generateFileReport(writer, fileRef)); project.addChildRef(fileRef); } - treeRootHolder.setRoot(new DumbComponent(Component.Type.PROJECT, 1, PROJECT_UUID, "PROJECT", components.toArray(new Component[components.size()]))); + treeRootHolder.setRoot(DumbComponent.builder(Component.Type.PROJECT, 1).setUuid(PROJECT_UUID).setKey("PROJECT").build()); writer.writeComponent(project.build()); @@ -135,7 +135,7 @@ public class PersistFileSourcesStepTest { writer.writeComponentSymbols(fileRef, lineData.symbols); writer.writeComponentDuplications(fileRef, lineData.duplications); - return new DumbComponent(Component.Type.FILE, fileRef, Uuids.create(), "PROJECT:" + fileRef); + return DumbComponent.builder(Component.Type.FILE, fileRef).setUuid(Uuids.create()).setKey("PROJECT:" + fileRef).build(); } private static class LineData { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/batch/ComponentTreeRule.java b/server/sonar-server/src/test/java/org/sonar/server/computation/batch/ComponentTreeRule.java index db6e2bc5710..9caf27388cf 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/batch/ComponentTreeRule.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/batch/ComponentTreeRule.java @@ -96,12 +96,11 @@ public class ComponentTreeRule implements TestRule { } private DumbComponent newComponent(BatchReport.Component component, BUILD_OPTIONS build_options) { - return new DumbComponent( - ComponentImpl.convertType(component.getType()), - component.getRef(), - build_options.uuid ? uuidOf(component.getRef()) : null, - build_options.key ? keyOf(component.getRef()) : null, - buildChildren(component, build_options)); + return DumbComponent.builder(ComponentImpl.convertType(component.getType()), component.getRef()) + .setUuid(build_options.uuid ? uuidOf(component.getRef()) : null) + .setKey(build_options.key ? keyOf(component.getRef()) : null) + .addChildren(buildChildren(component, build_options)) + .build(); } private Component[] buildChildren(BatchReport.Component component, final BUILD_OPTIONS build_options) { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/component/DumbComponent.java b/server/sonar-server/src/test/java/org/sonar/server/computation/component/DumbComponent.java index 2c82022b9f6..9618f211abd 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/component/DumbComponent.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/component/DumbComponent.java @@ -22,8 +22,6 @@ package org.sonar.server.computation.component; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; import java.util.List; import javax.annotation.Nullable; @@ -41,19 +39,6 @@ public class DumbComponent implements Component { private final String uuid, key, name; private final List<Component> children; - /** - * @deprecated use Builder - */ - @Deprecated - public DumbComponent(Type type, int ref, @Nullable String uuid, @Nullable String key, @Nullable Component... children) { - this.type = type; - this.ref = ref; - this.uuid = uuid; - this.key = key; - this.name = key; - this.children = children == null ? Collections.<Component>emptyList() : ImmutableList.copyOf(Arrays.asList(children)); - } - private DumbComponent(Builder builder) { this.type = builder.type; this.ref = builder.ref; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/component/PostOrderDepthTraversalTypeAwareVisitorTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/component/PostOrderDepthTraversalTypeAwareVisitorTest.java index 50bd7394ea7..f2be283b461 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/component/PostOrderDepthTraversalTypeAwareVisitorTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/component/PostOrderDepthTraversalTypeAwareVisitorTest.java @@ -39,15 +39,20 @@ public class PostOrderDepthTraversalTypeAwareVisitorTest { private static final Component MODULE_2 = component(MODULE, 2, DIRECTORY_3); private static final Component COMPONENT_TREE = component(PROJECT, 1, MODULE_2); - private final DepthTraversalTypeAwareVisitor spyProjectVisitor = spy(new DepthTraversalTypeAwareVisitor(PROJECT, POST_ORDER) {}); - private final DepthTraversalTypeAwareVisitor spyModuleVisitor = spy(new DepthTraversalTypeAwareVisitor(MODULE, POST_ORDER) {}); - private final DepthTraversalTypeAwareVisitor spyDirectoryVisitor = spy(new DepthTraversalTypeAwareVisitor(DIRECTORY, POST_ORDER) {}); - private final DepthTraversalTypeAwareVisitor spyFileVisitor = spy(new DepthTraversalTypeAwareVisitor(FILE, POST_ORDER) {}); + private final DepthTraversalTypeAwareVisitor spyProjectVisitor = spy(new DepthTraversalTypeAwareVisitor(PROJECT, POST_ORDER) { + }); + private final DepthTraversalTypeAwareVisitor spyModuleVisitor = spy(new DepthTraversalTypeAwareVisitor(MODULE, POST_ORDER) { + }); + private final DepthTraversalTypeAwareVisitor spyDirectoryVisitor = spy(new DepthTraversalTypeAwareVisitor(DIRECTORY, POST_ORDER) { + }); + private final DepthTraversalTypeAwareVisitor spyFileVisitor = spy(new DepthTraversalTypeAwareVisitor(FILE, POST_ORDER) { + }); private final InOrder inOrder = inOrder(spyProjectVisitor, spyModuleVisitor, spyDirectoryVisitor, spyFileVisitor); @Test(expected = NullPointerException.class) public void non_null_max_depth_fast_fail() { - new DepthTraversalTypeAwareVisitor(null, POST_ORDER) {}; + new DepthTraversalTypeAwareVisitor(null, POST_ORDER) { + }; } @Test(expected = NullPointerException.class) @@ -260,7 +265,7 @@ public class PostOrderDepthTraversalTypeAwareVisitorTest { } private static Component component(final Component.Type type, final int ref, final Component... children) { - return new DumbComponent(type, ref, null, null, children); + return DumbComponent.builder(type, ref).addChildren(children).build(); } } diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/component/PreOrderDepthTraversalTypeAwareVisitorTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/component/PreOrderDepthTraversalTypeAwareVisitorTest.java index fffa395d5eb..2c54c8621d8 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/component/PreOrderDepthTraversalTypeAwareVisitorTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/component/PreOrderDepthTraversalTypeAwareVisitorTest.java @@ -39,15 +39,20 @@ public class PreOrderDepthTraversalTypeAwareVisitorTest { private static final Component MODULE_2 = component(MODULE, 2, DIRECTORY_3); private static final Component COMPONENT_TREE = component(PROJECT, 1, MODULE_2); - private final DepthTraversalTypeAwareVisitor spyProjectVisitor = spy(new DepthTraversalTypeAwareVisitor(PROJECT, PRE_ORDER) {}); - private final DepthTraversalTypeAwareVisitor spyModuleVisitor = spy(new DepthTraversalTypeAwareVisitor(MODULE, PRE_ORDER) {}); - private final DepthTraversalTypeAwareVisitor spyDirectoryVisitor = spy(new DepthTraversalTypeAwareVisitor(DIRECTORY, PRE_ORDER) {}); - private final DepthTraversalTypeAwareVisitor spyFileVisitor = spy(new DepthTraversalTypeAwareVisitor(FILE, PRE_ORDER) {}); + private final DepthTraversalTypeAwareVisitor spyProjectVisitor = spy(new DepthTraversalTypeAwareVisitor(PROJECT, PRE_ORDER) { + }); + private final DepthTraversalTypeAwareVisitor spyModuleVisitor = spy(new DepthTraversalTypeAwareVisitor(MODULE, PRE_ORDER) { + }); + private final DepthTraversalTypeAwareVisitor spyDirectoryVisitor = spy(new DepthTraversalTypeAwareVisitor(DIRECTORY, PRE_ORDER) { + }); + private final DepthTraversalTypeAwareVisitor spyFileVisitor = spy(new DepthTraversalTypeAwareVisitor(FILE, PRE_ORDER) { + }); private final InOrder inOrder = inOrder(spyProjectVisitor, spyModuleVisitor, spyDirectoryVisitor, spyFileVisitor); @Test(expected = NullPointerException.class) public void non_null_max_depth_fast_fail() { - new DepthTraversalTypeAwareVisitor(null, PRE_ORDER) {}; + new DepthTraversalTypeAwareVisitor(null, PRE_ORDER) { + }; } @Test(expected = NullPointerException.class) @@ -260,7 +265,7 @@ public class PreOrderDepthTraversalTypeAwareVisitorTest { } private static Component component(final Component.Type type, final int ref, final Component... children) { - return new DumbComponent(type, ref, null, null, children); + return DumbComponent.builder(type, ref).addChildren(children).build(); } } diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/component/TreeRootHolderImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/component/TreeRootHolderImplTest.java index 679b708ef18..52c8bdb3c0a 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/component/TreeRootHolderImplTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/component/TreeRootHolderImplTest.java @@ -53,10 +53,10 @@ public class TreeRootHolderImplTest { @Test public void get_by_ref() throws Exception { - Component file = new DumbComponent(Component.Type.FILE, 4, null, null); - Component directory = new DumbComponent(Component.Type.DIRECTORY, 3, null, null, file); - Component module = new DumbComponent(Component.Type.MODULE, 2, null, null, directory); - Component project = new DumbComponent(Component.Type.PROJECT, 1, null, null, module); + Component file = DumbComponent.builder(Component.Type.FILE, 4).build(); + Component directory = DumbComponent.builder(Component.Type.DIRECTORY, 3).addChildren(file).build(); + Component module = DumbComponent.builder(Component.Type.MODULE, 2).addChildren(directory).build(); + Component project = DumbComponent.builder(Component.Type.PROJECT, 1).addChildren(module).build(); treeRootHolder.setRoot(project); assertThat(treeRootHolder.getComponentByRef(1)).isEqualTo(project); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/event/EventRepositoryImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/event/EventRepositoryImplTest.java index 354057a95b5..bc3f7aac34c 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/event/EventRepositoryImplTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/event/EventRepositoryImplTest.java @@ -66,6 +66,6 @@ public class EventRepositoryImplTest { } private static Component newComponent(int i) { - return new DumbComponent(Component.Type.FILE, i, null, null); + return DumbComponent.builder(Component.Type.FILE, i).build(); } } diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ApplyPermissionsStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/ApplyPermissionsStepTest.java index e77c23cfff9..686a2572b84 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ApplyPermissionsStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/ApplyPermissionsStepTest.java @@ -118,7 +118,7 @@ public class ApplyPermissionsStepTest extends BaseStepTest { dbClient.permissionTemplateDao().addGroupPermission(permissionTemplateDto.getId(), null, UserRole.USER); dbSession.commit(); - Component project = new DumbComponent(Component.Type.PROJECT, 1, PROJECT_UUID, PROJECT_KEY); + Component project = DumbComponent.builder(Component.Type.PROJECT, 1).setUuid(PROJECT_UUID).setKey(PROJECT_KEY).build(); dbIdsRepository.setComponentId(project, projectDto.getId()); treeRootHolder.setRoot(project); @@ -146,7 +146,7 @@ public class ApplyPermissionsStepTest extends BaseStepTest { dbSession.commit(); - Component project = new DumbComponent(Component.Type.PROJECT, 1, PROJECT_UUID, PROJECT_KEY); + Component project = DumbComponent.builder(Component.Type.PROJECT, 1).setUuid(PROJECT_UUID).setKey(PROJECT_KEY).build(); dbIdsRepository.setComponentId(project, projectDto.getId()); treeRootHolder.setRoot(project); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/IndexComponentsStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/IndexComponentsStepTest.java index de876131970..00aed4c760b 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/IndexComponentsStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/IndexComponentsStepTest.java @@ -49,7 +49,7 @@ public class IndexComponentsStepTest extends BaseStepTest { @Test public void call_indexProject_of_dao() throws IOException { - Component project = new DumbComponent(Component.Type.PROJECT, 1, "PROJECT_UUID", PROJECT_KEY); + Component project = DumbComponent.builder(Component.Type.PROJECT, 1).setUuid("PROJECT_UUID").setKey(PROJECT_KEY).build(); dbIdsRepository.setComponentId(project, 123L); treeRootHolder.setRoot(project); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/IndexSourceLinesStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/IndexSourceLinesStepTest.java index d088251659c..bce022a2745 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/IndexSourceLinesStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/IndexSourceLinesStepTest.java @@ -73,7 +73,7 @@ public class IndexSourceLinesStepTest extends BaseStepTest { FileSourceTesting.updateDataColumn(connection, "FILE1_UUID", FileSourceTesting.newRandomData(1).build()); connection.close(); - treeRootHolder.setRoot(new DumbComponent(Component.Type.PROJECT, 1, "ABCD", "PROJECT_KEY")); + treeRootHolder.setRoot(DumbComponent.builder(Component.Type.PROJECT, 1).setUuid("ABCD").setKey("PROJECT_KEY").build()); step().execute(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/IndexTestsStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/IndexTestsStepTest.java index b36e572c090..6a53a5ed29c 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/IndexTestsStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/IndexTestsStepTest.java @@ -75,7 +75,7 @@ public class IndexTestsStepTest extends BaseStepTest { TestTesting.updateDataColumn(connection, "FILE1_UUID", TestTesting.newRandomTests(1)); connection.close(); - treeRootHolder.setRoot(new DumbComponent(Component.Type.PROJECT, 1, "ABCD", "PROJECT_KEY")); + treeRootHolder.setRoot(DumbComponent.builder(Component.Type.PROJECT, 1).setUuid("ABCD").setKey("PROJECT_KEY").build()); step().execute(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ParseReportStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/ParseReportStepTest.java index 986e7f7dd16..c1344850083 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ParseReportStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/ParseReportStepTest.java @@ -63,9 +63,10 @@ public class ParseReportStepTest extends BaseStepTest { @Test public void extract_report_from_db_and_browse_components() throws Exception { - DumbComponent root = new DumbComponent(Component.Type.PROJECT, 1, "PROJECT_UUID", PROJECT_KEY, - new DumbComponent(Component.Type.FILE, 2, "FILE1_UUID", "PROJECT_KEY:file1"), - new DumbComponent(Component.Type.FILE, 3, "FILE2_UUID", "PROJECT_KEY:file2")); + DumbComponent root = DumbComponent.builder(Component.Type.PROJECT, 1).setUuid("PROJECT_UUID").setKey(PROJECT_KEY).addChildren( + DumbComponent.builder(Component.Type.FILE, 2).setUuid("FILE1_UUID").setKey("PROJECT_KEY:file1").build(), + DumbComponent.builder(Component.Type.FILE, 3).setUuid("FILE2_UUID").setKey("PROJECT_KEY:file2").build()) + .build(); generateReport(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistComponentsAndSnapshotsStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistComponentsAndSnapshotsStepTest.java index 6ff9fce279b..2f076e3ab98 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistComponentsAndSnapshotsStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistComponentsAndSnapshotsStepTest.java @@ -123,10 +123,10 @@ public class PersistComponentsAndSnapshotsStepTest extends BaseStepTest { .setLanguage("java") .build()); - Component file = new DumbComponent(Component.Type.FILE, 4, "DEFG", "MODULE_KEY:src/main/java/dir/Foo.java"); - Component directory = new DumbComponent(Component.Type.DIRECTORY, 3, "CDEF", "MODULE_KEY:src/main/java/dir", file); - Component module = new DumbComponent(Component.Type.MODULE, 2, "BCDE", "MODULE_KEY", directory); - Component project = new DumbComponent(Component.Type.PROJECT, 1, "ABCD", PROJECT_KEY, module); + Component file = DumbComponent.builder(Component.Type.FILE, 4).setUuid("DEFG").setKey("MODULE_KEY:src/main/java/dir/Foo.java").build(); + Component directory = DumbComponent.builder(Component.Type.DIRECTORY, 3).setUuid("CDEF").setKey("MODULE_KEY:src/main/java/dir").addChildren(file).build(); + Component module = DumbComponent.builder(Component.Type.MODULE, 2).setUuid("BCDE").setKey("MODULE_KEY").addChildren(directory).build(); + Component project = DumbComponent.builder(Component.Type.PROJECT, 1).setUuid("ABCD").setKey(PROJECT_KEY).addChildren(module).build(); treeRootHolder.setRoot(project); sut.execute(); @@ -213,9 +213,11 @@ public class PersistComponentsAndSnapshotsStepTest extends BaseStepTest { .setPath("pom.xml") .build()); - treeRootHolder.setRoot(new DumbComponent(Component.Type.PROJECT, 1, "ABCD", PROJECT_KEY, - new DumbComponent(Component.Type.DIRECTORY, 2, "CDEF", PROJECT_KEY + ":/", - new DumbComponent(Component.Type.FILE, 3, "DEFG", PROJECT_KEY + ":pom.xml")))); + treeRootHolder.setRoot(DumbComponent.builder(Component.Type.PROJECT, 1).setUuid("ABCD").setKey(PROJECT_KEY).addChildren( + DumbComponent.builder(Component.Type.DIRECTORY, 2).setUuid("CDEF").setKey(PROJECT_KEY + ":/").addChildren( + DumbComponent.builder(Component.Type.FILE, 3).setUuid("DEFG").setKey(PROJECT_KEY + ":pom.xml").build() + ).build() + ).build()); sut.execute(); @@ -252,9 +254,11 @@ public class PersistComponentsAndSnapshotsStepTest extends BaseStepTest { .setIsTest(true) .build()); - treeRootHolder.setRoot(new DumbComponent(Component.Type.PROJECT, 1, "ABCD", PROJECT_KEY, - new DumbComponent(Component.Type.DIRECTORY, 2, "CDEF", PROJECT_KEY + ":src/test/java/dir", - new DumbComponent(Component.Type.FILE, 3, "DEFG", PROJECT_KEY + ":src/test/java/dir/FooTest.java")))); + treeRootHolder.setRoot(DumbComponent.builder(Component.Type.PROJECT, 1).setUuid("ABCD").setKey(PROJECT_KEY).addChildren( + DumbComponent.builder(Component.Type.DIRECTORY, 2).setUuid("CDEF").setKey(PROJECT_KEY + ":src/test/java/dir").addChildren( + DumbComponent.builder(Component.Type.FILE, 3).setUuid("DEFG").setKey(PROJECT_KEY + ":src/test/java/dir/FooTest.java").build()) + .build()) + .build()); sut.execute(); @@ -301,10 +305,13 @@ public class PersistComponentsAndSnapshotsStepTest extends BaseStepTest { .setPath("src/main/java/dir/Foo.java") .build()); - treeRootHolder.setRoot(new DumbComponent(Component.Type.PROJECT, 1, "ABCD", PROJECT_KEY, - new DumbComponent(Component.Type.MODULE, 2, "BCDE", "MODULE_KEY", - new DumbComponent(Component.Type.DIRECTORY, 3, "CDEF", "MODULE_KEY:src/main/java/dir", - new DumbComponent(Component.Type.FILE, 4, "DEFG", "MODULE_KEY:src/main/java/dir/Foo.java"))))); + treeRootHolder.setRoot(DumbComponent.builder(Component.Type.PROJECT, 1).setUuid("ABCD").setKey(PROJECT_KEY).addChildren( + DumbComponent.builder(Component.Type.MODULE, 2).setUuid("BCDE").setKey("MODULE_KEY").addChildren( + DumbComponent.builder(Component.Type.DIRECTORY, 3).setUuid("CDEF").setKey("MODULE_KEY:src/main/java/dir").addChildren( + DumbComponent.builder(Component.Type.FILE, 4).setUuid("DEFG").setKey("MODULE_KEY:src/main/java/dir/Foo.java").build()) + .build()) + .build()) + .build()); sut.execute(); @@ -373,11 +380,15 @@ public class PersistComponentsAndSnapshotsStepTest extends BaseStepTest { .setPath("src/main/java/dir") .build()); - treeRootHolder.setRoot(new DumbComponent(Component.Type.PROJECT, 1, "ABCD", PROJECT_KEY, - new DumbComponent(Component.Type.MODULE, 2, "BCDE", "MODULE_KEY", - new DumbComponent(Component.Type.MODULE, 3, "CDEF", "SUB_MODULE_1_KEY", - new DumbComponent(Component.Type.MODULE, 4, "DEFG", "SUB_MODULE_2_KEY", - new DumbComponent(Component.Type.DIRECTORY, 5, "EFGH", "SUB_MODULE_2_KEY:src/main/java/dir")))))); + treeRootHolder.setRoot(DumbComponent.builder(Component.Type.PROJECT, 1).setUuid("ABCD").setKey(PROJECT_KEY).addChildren( + DumbComponent.builder(Component.Type.MODULE, 2).setUuid("BCDE").setKey("MODULE_KEY").addChildren( + DumbComponent.builder(Component.Type.MODULE, 3).setUuid("CDEF").setKey("SUB_MODULE_1_KEY").addChildren( + DumbComponent.builder(Component.Type.MODULE, 4).setUuid("DEFG").setKey("SUB_MODULE_2_KEY").addChildren( + DumbComponent.builder(Component.Type.DIRECTORY, 5).setUuid("EFGH").setKey("SUB_MODULE_2_KEY:src/main/java/dir").build()) + .build()) + .build()) + .build()) + .build()); sut.execute(); @@ -434,10 +445,11 @@ public class PersistComponentsAndSnapshotsStepTest extends BaseStepTest { .setName("Module B") .build()); - treeRootHolder.setRoot(new DumbComponent(Component.Type.PROJECT, 1, "ABCD", PROJECT_KEY, - new DumbComponent(Component.Type.MODULE, 2, "BCDE", "MODULE_A", - new DumbComponent(Component.Type.MODULE, 3, "DEFG", "SUB_MODULE_A")), - new DumbComponent(Component.Type.MODULE, 4, "CDEF", "MODULE_B"))); + treeRootHolder.setRoot(DumbComponent.builder(Component.Type.PROJECT, 1).setUuid("ABCD").setKey(PROJECT_KEY).addChildren( + DumbComponent.builder(Component.Type.MODULE, 2).setUuid("BCDE").setKey("MODULE_A").addChildren( + DumbComponent.builder(Component.Type.MODULE, 3).setUuid("DEFG").setKey("SUB_MODULE_A").build()).build(), + DumbComponent.builder(Component.Type.MODULE, 4).setUuid("CDEF").setKey("MODULE_B").build()) + .build()); sut.execute(); @@ -505,10 +517,13 @@ public class PersistComponentsAndSnapshotsStepTest extends BaseStepTest { .setPath("src/main/java/dir/Foo.java") .build()); - treeRootHolder.setRoot(new DumbComponent(Component.Type.PROJECT, 1, "ABCD", PROJECT_KEY, - new DumbComponent(Component.Type.MODULE, 2, "BCDE", "MODULE_KEY", - new DumbComponent(Component.Type.DIRECTORY, 3, "CDEF", "MODULE_KEY:src/main/java/dir", - new DumbComponent(Component.Type.FILE, 4, "DEFG", "MODULE_KEY:src/main/java/dir/Foo.java"))))); + treeRootHolder.setRoot(DumbComponent.builder(Component.Type.PROJECT, 1).setUuid("ABCD").setKey(PROJECT_KEY).addChildren( + DumbComponent.builder(Component.Type.MODULE, 2).setUuid("BCDE").setKey("MODULE_KEY").addChildren( + DumbComponent.builder(Component.Type.DIRECTORY, 3).setUuid("CDEF").setKey("MODULE_KEY:src/main/java/dir").addChildren( + DumbComponent.builder(Component.Type.FILE, 4).setUuid("DEFG").setKey("MODULE_KEY:src/main/java/dir/Foo.java").build()) + .build()) + .build()) + .build()); sut.execute(); @@ -578,9 +593,10 @@ public class PersistComponentsAndSnapshotsStepTest extends BaseStepTest { .setPath("New path") .build()); - treeRootHolder.setRoot(new DumbComponent(Component.Type.PROJECT, 1, "ABCD", PROJECT_KEY, - new DumbComponent(Component.Type.MODULE, 2, "BCDE", "MODULE_KEY"))); - + treeRootHolder.setRoot(DumbComponent.builder(Component.Type.PROJECT, 1).setUuid("ABCD").setKey(PROJECT_KEY).addChildren( + DumbComponent.builder(Component.Type.MODULE, 2).setUuid("BCDE").setKey("MODULE_KEY").build()) + .build()); + sut.execute(); ComponentDto projectReloaded = dbClient.componentDao().selectNullableByKey(session, PROJECT_KEY); @@ -614,9 +630,10 @@ public class PersistComponentsAndSnapshotsStepTest extends BaseStepTest { .setDescription("New module description") .build()); - treeRootHolder.setRoot(new DumbComponent(Component.Type.PROJECT, 1, "ABCD", PROJECT_KEY, - new DumbComponent(Component.Type.MODULE, 2, "BCDE", "MODULE_KEY"))); - + treeRootHolder.setRoot(DumbComponent.builder(Component.Type.PROJECT, 1).setUuid("ABCD").setKey(PROJECT_KEY).addChildren( + DumbComponent.builder(Component.Type.MODULE, 2).setUuid("BCDE").setKey("MODULE_KEY").build()) + .build()); + sut.execute(); ComponentDto projectReloaded = dbClient.componentDao().selectNullableByKey(session, PROJECT_KEY); @@ -649,8 +666,9 @@ public class PersistComponentsAndSnapshotsStepTest extends BaseStepTest { .setPath("New path") .build()); - treeRootHolder.setRoot(new DumbComponent(Component.Type.PROJECT, 1, "ABCD", PROJECT_KEY, - new DumbComponent(Component.Type.MODULE, 2, "BCDE", "MODULE_KEY"))); + treeRootHolder.setRoot(DumbComponent.builder(Component.Type.PROJECT, 1).setUuid("ABCD").setKey(PROJECT_KEY).addChildren( + DumbComponent.builder(Component.Type.MODULE, 2).setUuid("BCDE").setKey("MODULE_KEY").build()) + .build()); sut.execute(); @@ -704,11 +722,15 @@ public class PersistComponentsAndSnapshotsStepTest extends BaseStepTest { .setPath("src/main/java/dir/Foo.java") .build()); - treeRootHolder.setRoot(new DumbComponent(Component.Type.PROJECT, 1, "ABCD", PROJECT_KEY, - new DumbComponent(Component.Type.MODULE, 2, "EDCB", "MODULE_A", - new DumbComponent(Component.Type.MODULE, 3, "BCDE", "MODULE_B", - new DumbComponent(Component.Type.DIRECTORY, 4, "CDEF", "MODULE_B:src/main/java/dir", - new DumbComponent(Component.Type.FILE, 5, "DEFG", "MODULE_B:src/main/java/dir/Foo.java")))))); + treeRootHolder.setRoot(DumbComponent.builder(Component.Type.PROJECT, 1).setUuid("ABCD").setKey(PROJECT_KEY).addChildren( + DumbComponent.builder(Component.Type.MODULE, 2).setUuid("EDCB").setKey("MODULE_A").addChildren( + DumbComponent.builder(Component.Type.MODULE, 3).setUuid("BCDE").setKey("MODULE_B").addChildren( + DumbComponent.builder(Component.Type.DIRECTORY, 4).setUuid("CDEF").setKey("MODULE_B:src/main/java/dir").addChildren( + DumbComponent.builder(Component.Type.FILE, 5).setUuid("DEFG").setKey("MODULE_B:src/main/java/dir/Foo.java").build()) + .build()) + .build()) + .build()) + .build()); sut.execute(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistDuplicationsStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistDuplicationsStepTest.java index c61cfb73622..258456a233b 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistDuplicationsStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistDuplicationsStepTest.java @@ -131,9 +131,9 @@ public class PersistDuplicationsStepTest extends BaseStepTest { @Test public void persist_duplications_on_same_file_linked_on_a_module() throws Exception { - Component file = new DumbComponent(Component.Type.FILE, 3, "CDEF", "MODULE_KEY:file"); - Component module = new DumbComponent(Component.Type.MODULE, 2, "BCDE", "MODULE_KEY", file); - Component project = new DumbComponent(Component.Type.PROJECT, 1, "ABCD", PROJECT_KEY, module); + Component file = DumbComponent.builder(Component.Type.FILE, 3).setUuid("CDEF").setKey("MODULE_KEY:file").build(); + Component module = DumbComponent.builder(Component.Type.MODULE, 2).setUuid("BCDE").setKey("MODULE_KEY").addChildren(file).build(); + Component project = DumbComponent.builder(Component.Type.PROJECT, 1).setUuid("ABCD").setKey(PROJECT_KEY).addChildren(module).build(); treeRootHolder.setRoot(project); dbIdsRepository.setComponentId(project, 1); @@ -190,9 +190,9 @@ public class PersistDuplicationsStepTest extends BaseStepTest { @Test public void persist_duplications_on_same_file_linked_on_a_folder() { - Component file = new DumbComponent(Component.Type.FILE, 3, "CDEF", "PROJECT_KEY:file"); - Component directory = new DumbComponent(Component.Type.DIRECTORY, 2, "BCDE", "PROJECT_KEY:dir", file); - Component project = new DumbComponent(Component.Type.PROJECT, 1, "ABCD", PROJECT_KEY, directory); + Component file = DumbComponent.builder(Component.Type.FILE, 3).setUuid("CDEF").setKey("PROJECT_KEY:file").build(); + Component directory = DumbComponent.builder(Component.Type.DIRECTORY, 2).setUuid("BCDE").setKey("PROJECT_KEY:dir").addChildren(file).build(); + Component project = DumbComponent.builder(Component.Type.PROJECT, 1).setUuid("ABCD").setKey(PROJECT_KEY).addChildren(directory).build(); treeRootHolder.setRoot(project); dbIdsRepository.setComponentId(project, 1); @@ -249,10 +249,10 @@ public class PersistDuplicationsStepTest extends BaseStepTest { @Test public void persist_duplications_on_same_file_linked_on_sub_folder() { - Component file = new DumbComponent(Component.Type.FILE, 10, "DEFG", "PROJECT_KEY:file"); - Component directory1 = new DumbComponent(Component.Type.DIRECTORY, 3, "CDEF", "PROJECT_KEY:dir1", file); - Component directory2 = new DumbComponent(Component.Type.DIRECTORY, 2, "BCDE", "PROJECT_KEY:dir2", directory1); - Component project = new DumbComponent(Component.Type.PROJECT, 1, "ABCD", PROJECT_KEY, directory2); + Component file = DumbComponent.builder(Component.Type.FILE, 10).setUuid("DEFG").setKey("PROJECT_KEY:file").build(); + Component directory1 = DumbComponent.builder(Component.Type.DIRECTORY, 3).setUuid("CDEF").setKey("PROJECT_KEY:dir1").addChildren(file).build(); + Component directory2 = DumbComponent.builder(Component.Type.DIRECTORY, 2).setUuid("BCDE").setKey("PROJECT_KEY:dir2").addChildren(directory1).build(); + Component project = DumbComponent.builder(Component.Type.PROJECT, 1).setUuid("ABCD").setKey(PROJECT_KEY).addChildren(directory2).build(); treeRootHolder.setRoot(project); dbIdsRepository.setComponentId(project, 1); @@ -318,9 +318,9 @@ public class PersistDuplicationsStepTest extends BaseStepTest { public void persist_duplications_on_different_files() { saveDuplicationMetric(); - Component file2 = new DumbComponent(Component.Type.FILE, 3, "CDEF", "PROJECT_KEY:file2"); - Component file = new DumbComponent(Component.Type.FILE, 2, "BCDE", "PROJECT_KEY:file"); - Component project = new DumbComponent(Component.Type.PROJECT, 1, "ABCD", PROJECT_KEY, file, file2); + Component file2 = DumbComponent.builder(Component.Type.FILE, 3).setUuid("CDEF").setKey("PROJECT_KEY:file2").build(); + Component file = DumbComponent.builder(Component.Type.FILE, 2).setUuid("BCDE").setKey("PROJECT_KEY:file").build(); + Component project = DumbComponent.builder(Component.Type.PROJECT, 1).setUuid("ABCD").setKey(PROJECT_KEY).addChildren(file, file2).build(); treeRootHolder.setRoot(project); dbIdsRepository.setComponentId(project, 1); @@ -401,8 +401,8 @@ public class PersistDuplicationsStepTest extends BaseStepTest { } private void initReportWithProjectAndFile() { - Component file = new DumbComponent(Component.Type.FILE, 2, "BCDE", "PROJECT_KEY:file"); - Component project = new DumbComponent(Component.Type.PROJECT, 1, "ABCD", PROJECT_KEY, file); + Component file = DumbComponent.builder(Component.Type.FILE, 2).setUuid("BCDE").setKey("PROJECT_KEY:file").build(); + Component project = DumbComponent.builder(Component.Type.PROJECT, 1).setUuid("ABCD").setKey(PROJECT_KEY).addChildren(file).build(); treeRootHolder.setRoot(project); dbIdsRepository.setComponentId(project, 1); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistEventsStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistEventsStepTest.java index b0b36c8d64b..dfb6a949c36 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistEventsStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistEventsStepTest.java @@ -88,7 +88,7 @@ public class PersistEventsStepTest extends BaseStepTest { public void nothing_to_do_when_no_events_in_report() throws Exception { dbTester.prepareDbUnit(getClass(), "nothing_to_do_when_no_events_in_report.xml"); - treeRootHolder.setRoot(new DumbComponent(Component.Type.PROJECT, 1, "ABCD", null)); + treeRootHolder.setRoot(DumbComponent.builder(Component.Type.PROJECT, 1).setUuid("ABCD").build()); reportReader.setMetadata(BatchReport.Metadata.newBuilder() .setRootComponentRef(1) @@ -109,8 +109,9 @@ public class PersistEventsStepTest extends BaseStepTest { public void persist_report_events_with_component_children() throws Exception { dbTester.prepareDbUnit(getClass(), "empty.xml"); - DumbComponent root = new DumbComponent(Component.Type.PROJECT, 1, "ABCD", null, - new DumbComponent(Component.Type.MODULE, 2, "BCDE", null)); + DumbComponent root = DumbComponent.builder(Component.Type.PROJECT, 1).setUuid("ABCD").addChildren( + DumbComponent.builder(Component.Type.MODULE, 2).setUuid("BCDE").build() + ).build(); treeRootHolder.setRoot(root); reportReader.setMetadata(BatchReport.Metadata.newBuilder() @@ -146,7 +147,7 @@ public class PersistEventsStepTest extends BaseStepTest { public void create_version_event() throws Exception { dbTester.prepareDbUnit(getClass(), "empty.xml"); - treeRootHolder.setRoot(new DumbComponent(Component.Type.PROJECT, 1, "ABCD", null)); + treeRootHolder.setRoot(DumbComponent.builder(Component.Type.PROJECT, 1).setUuid("ABCD").build()); reportReader.setMetadata(BatchReport.Metadata.newBuilder() .setRootComponentRef(1) @@ -169,7 +170,7 @@ public class PersistEventsStepTest extends BaseStepTest { public void keep_one_event_by_version() throws Exception { dbTester.prepareDbUnit(getClass(), "keep_one_event_by_version.xml"); - treeRootHolder.setRoot(new DumbComponent(Component.Type.PROJECT, 1, "ABCD", null)); + treeRootHolder.setRoot(DumbComponent.builder(Component.Type.PROJECT, 1).setUuid("ABCD").build()); reportReader.setMetadata(BatchReport.Metadata.newBuilder() .setRootComponentRef(1) diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistFileSourcesStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistFileSourcesStepTest.java index 355b1b5dd9d..edcd04043d6 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistFileSourcesStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistFileSourcesStepTest.java @@ -128,8 +128,9 @@ public class PersistFileSourcesStepTest extends BaseStepTest { @Test public void persist_last_line() throws Exception { - treeRootHolder.setRoot(new DumbComponent(Component.Type.PROJECT, 1, PROJECT_UUID, PROJECT_KEY, - new DumbComponent(Component.Type.FILE, FILE_REF, FILE_UUID, "PROJECT_KEY:file"))); + treeRootHolder.setRoot(DumbComponent.builder(Component.Type.PROJECT, 1).setUuid(PROJECT_UUID).setKey(PROJECT_KEY).addChildren( + DumbComponent.builder(Component.Type.FILE, FILE_REF).setUuid(FILE_UUID).setKey("PROJECT_KEY:file").build()) + .build()); reportReader.putComponent(BatchReport.Component.newBuilder() .setRef(1) @@ -433,9 +434,11 @@ public class PersistFileSourcesStepTest extends BaseStepTest { } private void initBasicReport(int numberOfLines) throws IOException { - treeRootHolder.setRoot(new DumbComponent(Component.Type.PROJECT, 1, PROJECT_UUID, PROJECT_KEY, - new DumbComponent(Component.Type.MODULE, 2, "MODULE", "MODULE_KEY", - new DumbComponent(Component.Type.FILE, FILE_REF, FILE_UUID, "MODULE_KEY:src/Foo.java")))); + treeRootHolder.setRoot(DumbComponent.builder(Component.Type.PROJECT, 1).setUuid(PROJECT_UUID).setKey(PROJECT_KEY).addChildren( + DumbComponent.builder(Component.Type.MODULE, 2).setUuid("MODULE").setKey("MODULE_KEY").addChildren( + DumbComponent.builder(Component.Type.FILE, FILE_REF).setUuid(FILE_UUID).setKey("MODULE_KEY:src/Foo.java").build()) + .build()) + .build()); reportReader.putComponent(BatchReport.Component.newBuilder() .setRef(1) diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistMeasuresStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistMeasuresStepTest.java index 81ac6888078..45ae35d92a3 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistMeasuresStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistMeasuresStepTest.java @@ -118,8 +118,8 @@ public class PersistMeasuresStepTest extends BaseStepTest { ComponentDto projectDto = addComponent(1, "project-key"); ComponentDto fileDto = addComponent(2, "file-key"); - Component file = new DumbComponent(Component.Type.FILE, 2, "CDEF", "MODULE_KEY:file"); - Component project = new DumbComponent(Component.Type.PROJECT, 1, "ABCD", PROJECT_KEY, file); + Component file = DumbComponent.builder(Component.Type.FILE, 2).setUuid("CDEF").setKey("MODULE_KEY:file").build(); + Component project = DumbComponent.builder(Component.Type.PROJECT, 1).setUuid("ABCD").setKey(PROJECT_KEY).addChildren(file).build(); treeRootHolder.setRoot(project); dbIdsRepository.setComponentId(project, projectDto.getId()); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistNumberOfDaysSinceLastCommitStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistNumberOfDaysSinceLastCommitStepTest.java index ff51c4d33ef..e8641103de4 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistNumberOfDaysSinceLastCommitStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistNumberOfDaysSinceLastCommitStepTest.java @@ -123,8 +123,9 @@ public class PersistNumberOfDaysSinceLastCommitStepTest extends BaseStepTest { } private void initReportWithProjectAndFile() { - treeRootHolder.setRoot(new DumbComponent(Component.Type.PROJECT, 1, "project-uuid", null, - new DumbComponent(Component.Type.FILE, 2, "file-uuid", null))); + treeRootHolder.setRoot(DumbComponent.builder(Component.Type.PROJECT, 1).setUuid("project-uuid").addChildren( + DumbComponent.builder(Component.Type.FILE, 2).setUuid("file-uuid").build()) + .build()); reportReader.setMetadata(BatchReport.Metadata.newBuilder() .setSnapshotId(1000) diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistProjectLinksStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistProjectLinksStepTest.java index a7ec2f5be22..4a199bac406 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistProjectLinksStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistProjectLinksStepTest.java @@ -90,8 +90,9 @@ public class PersistProjectLinksStepTest extends BaseStepTest { public void add_links_on_project_and_module() throws Exception { dbTester.prepareDbUnit(getClass(), "empty.xml"); - treeRootHolder.setRoot(new DumbComponent(Component.Type.PROJECT, 1, "ABCD", null, - new DumbComponent(Component.Type.MODULE, 2, "BCDE", null))); + treeRootHolder.setRoot(DumbComponent.builder(Component.Type.PROJECT, 1).setUuid("ABCD").addChildren( + DumbComponent.builder(Component.Type.MODULE, 2).setUuid("BCDE").build()) + .build()); // project and 1 module reportReader.putComponent(BatchReport.Component.newBuilder() @@ -119,7 +120,7 @@ public class PersistProjectLinksStepTest extends BaseStepTest { public void nothing_to_do_when_link_already_exists() throws Exception { dbTester.prepareDbUnit(getClass(), "nothing_to_do_when_link_already_exists.xml"); - treeRootHolder.setRoot(new DumbComponent(Component.Type.PROJECT, 1, "ABCD", null)); + treeRootHolder.setRoot(DumbComponent.builder(Component.Type.PROJECT, 1).setUuid("ABCD").build()); reportReader.putComponent(BatchReport.Component.newBuilder() .setRef(1) @@ -136,8 +137,9 @@ public class PersistProjectLinksStepTest extends BaseStepTest { public void do_not_add_links_on_file() throws Exception { dbTester.prepareDbUnit(getClass(), "empty.xml"); - treeRootHolder.setRoot(new DumbComponent(Component.Type.PROJECT, 1, "ABCD", null, - new DumbComponent(Component.Type.FILE, 2, "BCDE", null))); + treeRootHolder.setRoot(DumbComponent.builder(Component.Type.PROJECT, 1).setUuid("ABCD").addChildren( + DumbComponent.builder(Component.Type.FILE, 2).setUuid("BCDE").build()) + .build()); reportReader.putComponent(BatchReport.Component.newBuilder() .setRef(1) @@ -159,7 +161,7 @@ public class PersistProjectLinksStepTest extends BaseStepTest { public void update_link() throws Exception { dbTester.prepareDbUnit(getClass(), "update_link.xml"); - treeRootHolder.setRoot(new DumbComponent(Component.Type.PROJECT, 1, "ABCD", null)); + treeRootHolder.setRoot(DumbComponent.builder(Component.Type.PROJECT, 1).setUuid("ABCD").build()); reportReader.putComponent(BatchReport.Component.newBuilder() .setRef(1) @@ -176,7 +178,7 @@ public class PersistProjectLinksStepTest extends BaseStepTest { public void delete_link() throws Exception { dbTester.prepareDbUnit(getClass(), "delete_link.xml"); - treeRootHolder.setRoot(new DumbComponent(Component.Type.PROJECT, 1, "ABCD", null)); + treeRootHolder.setRoot(DumbComponent.builder(Component.Type.PROJECT, 1).setUuid("ABCD").build()); reportReader.putComponent(BatchReport.Component.newBuilder() .setRef(1) @@ -192,7 +194,7 @@ public class PersistProjectLinksStepTest extends BaseStepTest { public void not_delete_custom_link() throws Exception { dbTester.prepareDbUnit(getClass(), "not_delete_custom_link.xml"); - treeRootHolder.setRoot(new DumbComponent(Component.Type.PROJECT, 1, "ABCD", null)); + treeRootHolder.setRoot(DumbComponent.builder(Component.Type.PROJECT, 1).setUuid("ABCD").build()); reportReader.putComponent(BatchReport.Component.newBuilder() .setRef(1) @@ -208,7 +210,7 @@ public class PersistProjectLinksStepTest extends BaseStepTest { public void fail_when_trying_to_add_same_link_type_multiple_times() throws Exception { dbTester.prepareDbUnit(getClass(), "empty.xml"); - treeRootHolder.setRoot(new DumbComponent(Component.Type.PROJECT, 1, "ABCD", null)); + treeRootHolder.setRoot(DumbComponent.builder(Component.Type.PROJECT, 1).setUuid("ABCD").build()); reportReader.putComponent(BatchReport.Component.newBuilder() .setRef(1) diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PurgeDatastoresStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PurgeDatastoresStepTest.java index 38925d25ed5..ffb00f9d3cd 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PurgeDatastoresStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PurgeDatastoresStepTest.java @@ -69,7 +69,7 @@ public class PurgeDatastoresStepTest extends BaseStepTest { @Test public void call_purge_method_of_the_purge_task() throws IOException { - Component project = new DumbComponent(Component.Type.PROJECT, 1, "UUID-1234", PROJECT_KEY); + Component project = DumbComponent.builder(Component.Type.PROJECT, 1).setUuid("UUID-1234").setKey(PROJECT_KEY).build(); treeRootHolder.setRoot(project); dbIdsRepository.setComponentId(project, 123L); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/QualityProfileEventsStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/QualityProfileEventsStepTest.java index a72113f7e3f..d491d4a581f 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/QualityProfileEventsStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/QualityProfileEventsStepTest.java @@ -80,7 +80,7 @@ public class QualityProfileEventsStepTest { @Before public void setUp() throws Exception { - treeRootHolder.setRoot(new DumbComponent(Component.Type.PROJECT, 1, "uuid", "key")); + treeRootHolder.setRoot(DumbComponent.builder(Component.Type.PROJECT, 1).setUuid("uuid").setKey("key").build()); } @Test diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/SendIssueNotificationsStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/SendIssueNotificationsStepTest.java index a66e2c4085e..cbca0035cb0 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/SendIssueNotificationsStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/SendIssueNotificationsStepTest.java @@ -73,7 +73,7 @@ public class SendIssueNotificationsStepTest extends BaseStepTest { NewIssuesNotificationFactory newIssuesNotificationFactory = mock(NewIssuesNotificationFactory.class, Mockito.RETURNS_DEEP_STUBS); sut = new SendIssueNotificationsStep(issueCache, mock(RuleCache.class), treeRootHolder, notifService, reportReader, newIssuesNotificationFactory); - treeRootHolder.setRoot(new DumbComponent(Component.Type.PROJECT, 1, PROJECT_UUID, PROJECT_KEY)); + treeRootHolder.setRoot(DumbComponent.builder(Component.Type.PROJECT, 1).setUuid(PROJECT_UUID).setKey(PROJECT_KEY).build()); reportReader.setMetadata(BatchReport.Metadata.newBuilder() .setRootComponentRef(1) diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ValidateProjectStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/ValidateProjectStepTest.java index 290ab589a5f..ffd5d8414e2 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ValidateProjectStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/ValidateProjectStepTest.java @@ -90,7 +90,7 @@ public class ValidateProjectStepTest { settings.appendProperty(CoreProperties.CORE_PREVENT_AUTOMATIC_PROJECT_CREATION, "true"); dbClient.componentDao().insert(dbSession, ComponentTesting.newProjectDto("ABCD").setKey(PROJECT_KEY)); dbSession.commit(); - treeRootHolder.setRoot(new DumbComponent(Component.Type.PROJECT, 1, "ABCD", PROJECT_KEY)); + treeRootHolder.setRoot(DumbComponent.builder(Component.Type.PROJECT, 1).setUuid("ABCD").setKey(PROJECT_KEY).build()); sut.execute(); } @@ -108,7 +108,7 @@ public class ValidateProjectStepTest { .build()); settings.appendProperty(CoreProperties.CORE_PREVENT_AUTOMATIC_PROJECT_CREATION, "true"); - treeRootHolder.setRoot(new DumbComponent(Component.Type.PROJECT, 1, "ABCD", PROJECT_KEY)); + treeRootHolder.setRoot(DumbComponent.builder(Component.Type.PROJECT, 1).setUuid("ABCD").setKey(PROJECT_KEY).build()); sut.execute(); } @@ -123,7 +123,7 @@ public class ValidateProjectStepTest { .build()); settings.appendProperty(CoreProperties.CORE_PREVENT_AUTOMATIC_PROJECT_CREATION, "false"); - treeRootHolder.setRoot(new DumbComponent(Component.Type.PROJECT, 1, "ABCD", PROJECT_KEY)); + treeRootHolder.setRoot(DumbComponent.builder(Component.Type.PROJECT, 1).setUuid("ABCD").setKey(PROJECT_KEY).build()); sut.execute(); } @@ -138,7 +138,7 @@ public class ValidateProjectStepTest { .setType(Constants.ComponentType.PROJECT) .setKey(PROJECT_KEY) .build()); - treeRootHolder.setRoot(new DumbComponent(Component.Type.PROJECT, 1, "ABCD", PROJECT_KEY + ":origin/master")); + treeRootHolder.setRoot(DumbComponent.builder(Component.Type.PROJECT, 1).setUuid("ABCD").setKey(PROJECT_KEY + ":origin/master").build()); sut.execute(); } @@ -157,7 +157,7 @@ public class ValidateProjectStepTest { .setType(Constants.ComponentType.PROJECT) .setKey(PROJECT_KEY) .build()); - treeRootHolder.setRoot(new DumbComponent(Component.Type.PROJECT, 1, "ABCD", PROJECT_KEY + ":bran#ch")); + treeRootHolder.setRoot(DumbComponent.builder(Component.Type.PROJECT, 1).setUuid("ABCD").setKey(PROJECT_KEY + ":bran#ch").build()); sut.execute(); } @@ -183,8 +183,9 @@ public class ValidateProjectStepTest { .setType(Constants.ComponentType.MODULE) .setKey("Module$Key") .build()); - treeRootHolder.setRoot(new DumbComponent(Component.Type.PROJECT, 1, "ABCD", invalidProjectKey, - new DumbComponent(Component.Type.MODULE, 2, "BCDE", "Module$Key"))); + treeRootHolder.setRoot(DumbComponent.builder(Component.Type.PROJECT, 1).setUuid("ABCD").setKey(invalidProjectKey).addChildren( + DumbComponent.builder(Component.Type.MODULE, 2).setUuid("BCDE").setKey("Module$Key").build()) + .build()); sut.execute(); } @@ -214,8 +215,9 @@ public class ValidateProjectStepTest { dbClient.componentDao().insert(dbSession, project); dbSession.commit(); - treeRootHolder.setRoot(new DumbComponent(Component.Type.PROJECT, 1, "ABCD", PROJECT_KEY, - new DumbComponent(Component.Type.MODULE, 2, "BCDE", MODULE_KEY))); + treeRootHolder.setRoot(DumbComponent.builder(Component.Type.PROJECT, 1).setUuid("ABCD").setKey(PROJECT_KEY).addChildren( + DumbComponent.builder(Component.Type.MODULE, 2).setUuid("BCDE").setKey(MODULE_KEY).build()) + .build()); sut.execute(); } @@ -247,8 +249,9 @@ public class ValidateProjectStepTest { dbClient.componentDao().insert(dbSession, module); dbSession.commit(); - treeRootHolder.setRoot(new DumbComponent(Component.Type.PROJECT, 1, "ABCD", PROJECT_KEY, - new DumbComponent(Component.Type.MODULE, 2, "BCDE", MODULE_KEY))); + treeRootHolder.setRoot(DumbComponent.builder(Component.Type.PROJECT, 1).setUuid("ABCD").setKey(PROJECT_KEY).addChildren( + DumbComponent.builder(Component.Type.MODULE, 2).setUuid("BCDE").setKey(MODULE_KEY).build()) + .build()); sut.execute(); } @@ -281,9 +284,10 @@ public class ValidateProjectStepTest { dbClient.componentDao().insert(dbSession, module); dbSession.commit(); - treeRootHolder.setRoot(new DumbComponent(Component.Type.PROJECT, 1, "ABCD", PROJECT_KEY, - new DumbComponent(Component.Type.MODULE, 2, "BCDE", MODULE_KEY))); - + treeRootHolder.setRoot(DumbComponent.builder(Component.Type.PROJECT, 1).setUuid("ABCD").setKey(PROJECT_KEY).addChildren( + DumbComponent.builder(Component.Type.MODULE, 2).setUuid("BCDE").setKey(MODULE_KEY).build()) + .build()); + sut.execute(); } } |