From 8f3c148dbc670e103d524ad93dc24d7b5d5686ff Mon Sep 17 00:00:00 2001 From: =?utf8?q?L=C3=A9o=20Geoffroy?= Date: Mon, 8 May 2023 18:12:23 +0200 Subject: [PATCH] SONAR-18856 Adapt IT tests to support branch and project having different uuids --- .../component/BranchPersisterImplIT.java | 12 +- .../component/ComponentUuidFactoryImplIT.java | 6 +- .../component/ProjectPersisterIT.java | 12 +- .../ReferenceBranchComponentUuidsIT.java | 2 +- .../SiblingComponentsWithOpenIssuesIT.java | 6 +- .../filemove/FileMoveDetectionStepIT.java | 2 +- .../PullRequestFileMoveDetectionStepIT.java | 2 +- .../issue/ComponentIssuesLoaderIT.java | 8 +- .../issue/ProjectTrackerBaseLazyInputIT.java | 2 +- .../issue/SiblingsIssueMergerIT.java | 2 +- .../issue/SourceBranchComponentUuidsIT.java | 2 +- .../issue/TargetBranchComponentUuidsIT.java | 2 +- .../measure/MeasureRepositoryImplIT.java | 2 +- ...ewCodeReferenceBranchComponentUuidsIT.java | 2 +- .../source/DbLineHashVersionIT.java | 8 +- .../step/BuildComponentTreeStepIT.java | 8 +- .../step/LoadFileHashesAndStatusStepIT.java | 6 +- .../step/LoadPeriodsStepIT.java | 8 +- ...oadReportAnalysisMetadataHolderStepIT.java | 10 +- .../step/PersistEventsStepIT.java | 2 +- .../step/PersistIssuesStepIT.java | 22 +-- .../step/PersistProjectLinksStepIT.java | 8 +- .../step/PersistPushEventsStepIT.java | 2 +- .../step/ProjectNclocComputationStepIT.java | 4 +- .../step/ReportPersistComponentsStepIT.java | 5 +- .../step/SendIssueNotificationsStepIT.java | 2 +- .../step/UpdateNeedIssueSyncStepIT.java | 2 +- .../step/ValidateProjectStepIT.java | 6 +- .../step/ViewsPersistComponentsStepIT.java | 6 +- .../analysis/ExportAnalysesStepIT.java | 4 +- .../branches/ExportBranchesStepIT.java | 4 +- .../component/ExportComponentsStepIT.java | 12 +- .../issue/ExportIssuesChangelogStepIT.java | 4 +- .../issue/ExportIssuesStepIT.java | 4 +- .../rule/ExportAdHocRulesStepIT.java | 4 +- .../steps/ExportEventsStepIT.java | 4 +- .../steps/ExportLinksStepIT.java | 8 +- .../steps/ExportLiveMeasuresStepIT.java | 12 +- .../steps/ExportMeasuresStepIT.java | 4 +- .../steps/ExportNewCodePeriodsStepIT.java | 6 +- .../steps/ExportSettingsStepIT.java | 6 +- .../steps/LoadProjectStepIT.java | 2 +- .../ProjectConfigurationFactoryTest.java | 5 +- .../PullRequestSourceBranchMergerTest.java | 2 +- ...ailureNotificationExecutionListenerIT.java | 6 +- .../sonar/ce/queue/InternalCeQueueImplIT.java | 2 +- .../alm/setting/ProjectAlmSettingDaoIT.java | 26 +-- .../ProjectAlmSettingDaoWithPersisterIT.java | 6 +- .../java/org/sonar/db/ce/CeActivityDaoIT.java | 12 +- .../org/sonar/db/ce/CeTaskMessageDaoIT.java | 2 +- .../db/component/AnalysisPropertiesDaoIT.java | 2 +- .../component/ApplicationProjectsDaoIT.java | 4 +- .../org/sonar/db/component/BranchDaoIT.java | 70 ++++---- .../sonar/db/component/ComponentDaoIT.java | 168 +++++++++--------- .../component/ComponentKeyUpdaterDaoIT.java | 8 +- .../sonar/db/component/ProjectLinkDaoIT.java | 18 +- .../ScrollForFileMoveComponentDaoIT.java | 18 +- .../org/sonar/db/component/SnapshotDaoIT.java | 54 +++--- .../db/duplication/DuplicationDaoIT.java | 10 +- .../java/org/sonar/db/event/EventDaoIT.java | 2 +- .../java/org/sonar/db/issue/IssueDaoIT.java | 14 +- .../org/sonar/db/issue/IssueMapperIT.java | 4 +- .../sonar/db/measure/LiveMeasureDaoIT.java | 36 ++-- .../org/sonar/db/measure/MeasureDaoIT.java | 10 +- .../ProjectMeasuresIndexerIteratorIT.java | 42 ++--- .../db/newcodeperiod/NewCodePeriodDaoIT.java | 2 +- .../db/permission/AuthorizationDaoIT.java | 122 ++++++------- .../db/permission/GroupPermissionDaoIT.java | 102 +++++------ .../GroupPermissionDaoWithPersisterIT.java | 10 +- .../db/permission/UserPermissionDaoIT.java | 52 +++--- .../UserPermissionDaoWithPersisterIT.java | 12 +- .../sonar/db/portfolio/PortfolioDaoIT.java | 72 ++++---- .../org/sonar/db/project/ProjectDaoIT.java | 26 +-- .../sonar/db/property/PropertiesDaoIT.java | 32 ++-- .../PropertiesDaoWithPersisterIT.java | 2 +- .../org/sonar/db/purge/PurgeCommandsIT.java | 50 +++--- .../java/org/sonar/db/purge/PurgeDaoIT.java | 134 +++++++------- .../sonar/db/purge/PurgeDaoWithAuditIT.java | 2 +- .../org/sonar/db/purge/PurgeMapperIT.java | 12 +- .../ProjectQgateAssociationDaoIT.java | 86 ++++----- .../db/qualitygate/QualityGateDaoIT.java | 4 +- .../qualityprofile/QualityProfileDaoIT.java | 76 ++++---- .../db/report/RegulatoryReportDaoIT.java | 4 +- .../org/sonar/db/source/FileSourceDaoIT.java | 14 +- .../it/java/org/sonar/db/user/RoleDaoIT.java | 6 +- .../db/user/UserDismissedMessagesDaoIT.java | 18 +- .../org/sonar/db/user/UserTokenDaoIT.java | 2 +- .../org/sonar/db/webhook/WebhookDaoIT.java | 6 +- .../db/webhook/WebhookDaoWithPersisterIT.java | 6 +- .../sonar/db/component/ComponentDbTester.java | 152 +++++++--------- .../sonar/db/component/ComponentTesting.java | 4 +- .../org/sonar/db/issue/IssueDbTester.java | 6 +- .../component/index/ComponentIndexerIT.java | 32 ++-- .../server/favorite/FavoriteUpdaterIT.java | 18 +- .../server/issue/index/IssueIndexerIT.java | 30 ++-- .../issue/index/IssueIteratorFactoryIT.java | 12 +- .../notification/NewIssuesNotificationIT.java | 14 +- .../index/ProjectMeasuresIndexerIT.java | 48 ++--- .../qualitygate/QualityGateFinderIT.java | 10 +- .../server/view/index/ViewIndexerIT.java | 32 ++-- .../webhook/AsynchronousWebHooksImplIT.java | 2 +- .../webhook/SynchronousWebHooksImplIT.java | 16 +- .../server/user/ServerUserSessionTest.java | 136 +++++++------- .../server/user/TokenUserSessionTest.java | 20 +-- .../server/user/UserUpdaterUpdateTest.java | 6 +- .../WebhookQGChangeEventListenerIT.java | 4 +- .../index/AsyncIssueIndexingImplTest.java | 6 +- .../CheckAnyonePermissionsAtStartupTest.java | 4 +- .../ProjectsInWarningDaemonTest.java | 2 +- .../TelemetryDataLoaderImplTest.java | 26 +-- .../index/PermissionIndexerDaoIT.java | 10 +- .../index/ComponentIndexScoreTest.java | 4 +- .../index/ComponentIndexSearchTest.java | 26 +-- .../issue/index/IssueIndexFiltersTest.java | 40 ++--- .../index/IssueIndexSecurityReportsTest.java | 22 +-- .../IssueIndexSyncProgressCheckerTest.java | 6 +- .../issue/index/IssueQueryFactoryTest.java | 64 +++---- .../index/PermissionIndexerTest.java | 6 +- .../IssueChangeEventServiceImplTest.java | 16 +- ...lityProfileChangeEventServiceImplTest.java | 4 +- .../polling/PushEventPollSchedulerTest.java | 8 +- .../ws/azure/ImportAzureProjectActionIT.java | 2 +- .../ws/azure/SearchAzureReposActionIT.java | 2 +- .../ImportBitbucketCloudRepoActionIT.java | 2 +- .../SearchBitbucketCloudReposActionIT.java | 8 +- .../ImportBitbucketServerProjectActionIT.java | 2 +- .../SearchBitbucketServerReposActionIT.java | 12 +- .../github/ImportGithubProjectActionIT.java | 2 +- .../ListGithubRepositoriesActionIT.java | 4 +- .../ws/gitlab/SearchGitlabReposActionIT.java | 14 +- .../almsettings/ws/CountBindingActionIT.java | 12 +- .../server/almsettings/ws/DeleteActionIT.java | 4 +- .../almsettings/ws/GetBindingActionIT.java | 4 +- .../server/almsettings/ws/ListActionIT.java | 10 +- .../server/badge/ws/MeasureActionIT.java | 36 ++-- .../server/badge/ws/QualityGateActionIT.java | 28 +-- .../sonar/server/badge/ws/TokenActionIT.java | 8 +- .../server/badge/ws/TokenRenewActionIT.java | 8 +- .../server/batch/ProjectDataLoaderIT.java | 9 +- .../server/branch/ws/DeleteActionIT.java | 6 +- .../sonar/server/branch/ws/ListActionIT.java | 18 +- .../server/branch/ws/RenameActionIT.java | 8 +- ...etAutomaticDeletionProtectionActionIT.java | 10 +- .../ce/projectdump/ExportSubmitterImplIT.java | 4 +- .../ce/queue/BranchReportSubmitterIT.java | 10 +- .../server/ce/queue/ReportSubmitterIT.java | 12 +- .../sonar/server/ce/ws/ActivityActionIT.java | 56 +++--- .../server/ce/ws/ActivityStatusActionIT.java | 8 +- .../server/ce/ws/AnalysisStatusActionIT.java | 16 +- .../sonar/server/ce/ws/CancelActionIT.java | 8 +- .../sonar/server/ce/ws/ComponentActionIT.java | 24 +-- .../ce/ws/DismissAnalysisWarningActionIT.java | 10 +- .../org/sonar/server/ce/ws/TaskActionIT.java | 6 +- .../component/ComponentCleanerServiceIT.java | 17 +- .../server/component/ComponentFinderIT.java | 22 +-- .../ComponentServiceUpdateKeyIT.java | 16 +- .../server/component/ComponentUpdaterIT.java | 6 +- .../server/component/ws/AppActionIT.java | 34 ++-- .../server/component/ws/SearchActionIT.java | 16 +- .../component/ws/SearchProjectsActionIT.java | 32 ++-- .../server/component/ws/ShowActionIT.java | 42 ++--- .../component/ws/SuggestionsActionIT.java | 56 +++--- .../server/component/ws/TreeActionIT.java | 18 +- .../developers/ws/SearchEventsActionIT.java | 12 +- .../ws/SearchEventsActionNewIssuesIT.java | 14 +- .../ws/SearchEventsActionQualityGateIT.java | 24 +-- .../duplication/ws/DuplicationsParserIT.java | 26 +-- .../server/duplication/ws/ShowActionIT.java | 10 +- .../duplication/ws/ShowResponseBuilderIT.java | 12 +- .../sonar/server/favorite/ws/AddActionIT.java | 12 +- .../server/favorite/ws/RemoveActionIT.java | 3 +- .../server/hotspot/ws/AddCommentActionIT.java | 12 +- .../server/hotspot/ws/AssignActionIT.java | 40 ++--- .../hotspot/ws/ChangeStatusActionIT.java | 22 +-- .../hotspot/ws/DeleteCommentActionIT.java | 8 +- .../hotspot/ws/EditCommentActionIT.java | 8 +- .../server/hotspot/ws/SearchActionIT.java | 130 +++++++------- .../sonar/server/hotspot/ws/ShowActionIT.java | 78 ++++---- .../sonar/server/issue/AssignActionIT.java | 2 +- .../org/sonar/server/issue/IssueFinderIT.java | 2 +- .../server/issue/SetSeverityActionIT.java | 2 +- .../sonar/server/issue/SetTypeActionIT.java | 2 +- .../server/issue/TransitionServiceIT.java | 12 +- .../sonar/server/issue/WebIssueStorageIT.java | 12 +- .../server/issue/ws/AuthorsActionIT.java | 22 +-- .../server/issue/ws/BulkChangeActionIT.java | 46 ++--- .../server/issue/ws/ChangelogActionIT.java | 2 +- .../server/issue/ws/DoTransitionActionIT.java | 14 +- .../sonar/server/issue/ws/IssueUpdaterIT.java | 16 +- .../sonar/server/issue/ws/PullActionIT.java | 6 +- .../server/issue/ws/PullTaintActionIT.java | 7 +- .../server/issue/ws/ReindexActionIT.java | 4 +- .../issue/ws/SearchActionComponentsIT.java | 74 ++++---- .../server/issue/ws/SearchActionFacetsIT.java | 28 +-- .../sonar/server/issue/ws/SearchActionIT.java | 94 +++++----- .../server/issue/ws/SetSeverityActionIT.java | 2 +- .../server/issue/ws/SetTagsActionIT.java | 4 +- .../server/issue/ws/SetTypeActionIT.java | 4 +- .../sonar/server/issue/ws/TagsActionIT.java | 46 ++--- .../measure/live/ComponentIndexFactoryIT.java | 2 +- .../measure/live/ComponentIndexImplIT.java | 2 +- .../live/LiveMeasureComputerImplIT.java | 8 +- .../live/LiveMeasureTreeUpdaterImplIT.java | 4 +- .../live/LiveQualityGateComputerImplIT.java | 4 +- .../server/measure/ws/ComponentActionIT.java | 34 ++-- .../measure/ws/ComponentTreeActionIT.java | 82 ++++----- .../server/measure/ws/SearchActionIT.java | 41 +++-- .../measure/ws/SearchHistoryActionIT.java | 22 +-- .../server/newcodeperiod/ws/ListActionIT.java | 16 +- .../server/newcodeperiod/ws/SetActionIT.java | 26 +-- .../server/newcodeperiod/ws/ShowActionIT.java | 16 +- .../newcodeperiod/ws/UnsetActionIT.java | 14 +- .../server/notification/ws/AddActionIT.java | 16 +- .../server/notification/ws/ListActionIT.java | 10 +- .../notification/ws/RemoveActionIT.java | 8 +- .../permission/GroupPermissionChangerIT.java | 4 +- .../PermissionTemplateServiceIT.java | 40 ++--- .../permission/UserPermissionChangerIT.java | 6 +- .../permission/ws/AddGroupActionIT.java | 28 +-- .../server/permission/ws/AddUserActionIT.java | 28 +-- .../server/permission/ws/GroupsActionIT.java | 12 +- .../permission/ws/RemoveGroupActionIT.java | 28 +-- .../permission/ws/RemoveUserActionIT.java | 22 +-- .../server/permission/ws/UsersActionIT.java | 14 +- .../ws/template/ApplyTemplateActionIT.java | 2 +- .../template/BulkApplyTemplateActionIT.java | 41 +++-- .../server/project/ws/BulkDeleteActionIT.java | 52 +++--- .../server/project/ws/CreateActionIT.java | 4 +- .../server/project/ws/DeleteActionIT.java | 12 +- .../server/project/ws/ProjectFinderIT.java | 42 ++--- .../server/project/ws/SearchActionIT.java | 53 +++--- .../project/ws/SearchMyProjectsActionIT.java | 18 +- .../ws/SearchMyScannableProjectsActionIT.java | 48 ++--- .../server/project/ws/UpdateKeyActionIT.java | 2 +- .../project/ws/UpdateVisibilityActionIT.java | 28 +-- .../ws/CreateEventActionIT.java | 28 +-- .../projectanalysis/ws/DeleteActionIT.java | 10 +- .../ws/DeleteEventActionIT.java | 4 +- .../projectanalysis/ws/SearchActionIT.java | 55 +++--- .../ws/UpdateEventActionIT.java | 4 +- .../server/projectdump/ws/ExportActionIT.java | 2 +- .../server/projectdump/ws/StatusActionIT.java | 4 +- .../server/projectlink/ws/CreateActionIT.java | 18 +- .../server/projectlink/ws/DeleteActionIT.java | 14 +- .../server/projectlink/ws/SearchActionIT.java | 30 ++-- .../server/projecttag/ws/SetActionIT.java | 10 +- .../qualitygate/ws/DeselectActionIT.java | 16 +- .../qualitygate/ws/DestroyActionIT.java | 4 +- .../qualitygate/ws/GetByProjectActionIT.java | 14 +- .../qualitygate/ws/ProjectStatusActionIT.java | 36 ++-- .../server/qualitygate/ws/SearchActionIT.java | 30 ++-- .../server/qualitygate/ws/SelectActionIT.java | 18 +- .../qualityprofile/QProfileFactoryImplIT.java | 4 +- .../qualityprofile/ws/AddProjectActionIT.java | 16 +- .../qualityprofile/ws/DeleteActionIT.java | 2 +- .../qualityprofile/ws/ProjectsActionIT.java | 38 ++-- .../ws/RemoveProjectActionIT.java | 16 +- .../qualityprofile/ws/SearchActionIT.java | 12 +- .../qualityprofile/ws/ShowActionIT.java | 4 +- .../server/scannercache/ws/ClearActionIT.java | 14 +- .../server/scannercache/ws/GetActionIT.java | 14 +- .../setting/ws/ListDefinitionsActionIT.java | 3 +- .../server/setting/ws/ResetActionIT.java | 12 +- .../sonar/server/setting/ws/SetActionIT.java | 16 +- .../server/setting/ws/ValuesActionIT.java | 4 +- .../sonar/server/source/ws/IndexActionIT.java | 6 +- .../source/ws/IssueSnippetsActionIT.java | 2 +- .../sonar/server/source/ws/LinesActionIT.java | 34 ++-- .../sonar/server/source/ws/RawActionIT.java | 10 +- .../sonar/server/source/ws/ScmActionIT.java | 2 +- .../sonar/server/ui/ws/ComponentActionIT.java | 40 ++--- .../server/ui/ws/MarketplaceActionIT.java | 2 +- .../user/ws/CurrentActionHomepageIT.java | 14 +- .../sonar/server/user/ws/CurrentActionIT.java | 4 +- .../server/user/ws/DeactivateActionIT.java | 12 +- .../server/user/ws/SetHomepageActionIT.java | 6 +- .../server/usergroups/ws/DeleteActionIT.java | 2 +- .../server/usertoken/ws/GenerateActionIT.java | 8 +- .../server/usertoken/ws/SearchActionIT.java | 2 +- .../server/webhook/ws/CreateActionIT.java | 8 +- .../server/webhook/ws/DeleteActionIT.java | 4 +- .../sonar/server/webhook/ws/ListActionIT.java | 6 +- .../server/webhook/ws/UpdateActionIT.java | 10 +- .../webhook/ws/WebhookDeliveriesActionIT.java | 4 +- .../webhook/ws/WebhookDeliveryActionIT.java | 2 +- .../sonar/server/ce/ws/TaskFormatterTest.java | 2 +- ...archResponseFormatFormatOperationTest.java | 6 +- 287 files changed, 2610 insertions(+), 2645 deletions(-) diff --git a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/component/BranchPersisterImplIT.java b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/component/BranchPersisterImplIT.java index 8da1da4efe2..d6cdfd6b682 100644 --- a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/component/BranchPersisterImplIT.java +++ b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/component/BranchPersisterImplIT.java @@ -137,7 +137,7 @@ public class BranchPersisterImplIT { analysisMetadataHolder.setBranch(createBranch(BRANCH, true, "master")); analysisMetadataHolder.setProject(PROJECT); treeRootHolder.setRoot(MAIN); - dbTester.components().insertPublicProject(p -> p.setKey(MAIN.getKey()).setUuid(MAIN.getUuid())); + dbTester.components().insertPublicProject(p -> p.setKey(MAIN.getKey()).setUuid(MAIN.getUuid())).getMainBranchComponent(); dbTester.commit(); underTest.persist(dbTester.getSession()); @@ -153,7 +153,7 @@ public class BranchPersisterImplIT { analysisMetadataHolder.setProject(PROJECT); analysisMetadataHolder.setBranch(createBranch(BRANCH, false, "BRANCH_KEY")); treeRootHolder.setRoot(BRANCH1); - ComponentDto mainComponent = dbTester.components().insertPublicProject(p -> p.setKey(MAIN.getKey()).setUuid(MAIN.getUuid())); + ComponentDto mainComponent = dbTester.components().insertPublicProject(p -> p.setKey(MAIN.getKey()).setUuid(MAIN.getUuid())).getMainBranchComponent(); ComponentDto component = ComponentTesting.newBranchComponent(mainComponent, new BranchDto().setUuid(BRANCH1.getUuid()).setKey(BRANCH1.getKey()).setBranchType(BRANCH)); dbTester.getDbClient().componentDao().insert(dbTester.getSession(), component, false); @@ -171,7 +171,7 @@ public class BranchPersisterImplIT { analysisMetadataHolder.setProject(PROJECT); analysisMetadataHolder.setBranch(createBranch(BRANCH, false, "BRANCH_KEY")); treeRootHolder.setRoot(BRANCH1); - ComponentDto mainComponent = dbTester.components().insertPublicProject(p -> p.setKey(MAIN.getKey()).setUuid(MAIN.getUuid())); + ComponentDto mainComponent = dbTester.components().insertPublicProject(p -> p.setKey(MAIN.getKey()).setUuid(MAIN.getUuid())).getMainBranchComponent(); ComponentDto component = ComponentTesting.newBranchComponent(mainComponent, new BranchDto().setUuid(BRANCH1.getUuid()).setKey(BRANCH1.getKey()).setBranchType(BRANCH)); dbTester.getDbClient().componentDao().insert(dbTester.getSession(), component, false); @@ -190,7 +190,7 @@ public class BranchPersisterImplIT { analysisMetadataHolder.setProject(PROJECT); analysisMetadataHolder.setBranch(createBranch(BRANCH, false, "BRANCH_KEY")); treeRootHolder.setRoot(BRANCH1); - ComponentDto mainComponent = dbTester.components().insertPublicProject(p -> p.setKey(MAIN.getKey()).setUuid(MAIN.getUuid())); + ComponentDto mainComponent = dbTester.components().insertPublicProject(p -> p.setKey(MAIN.getKey()).setUuid(MAIN.getUuid())).getMainBranchComponent(); ComponentDto component = ComponentTesting.newBranchComponent(mainComponent, new BranchDto().setUuid(BRANCH1.getUuid()).setKey(BRANCH1.getKey()).setBranchType(BRANCH)); dbTester.getDbClient().componentDao().insert(dbTester.getSession(), component, false); @@ -213,7 +213,7 @@ public class BranchPersisterImplIT { analysisMetadataHolder.setPullRequestKey(PR1.getKey()); treeRootHolder.setRoot(PR1); - ComponentDto mainComponent = dbTester.components().insertPublicProject(p -> p.setKey(MAIN.getKey()).setUuid(MAIN.getUuid())); + ComponentDto mainComponent = dbTester.components().insertPublicProject(p -> p.setKey(MAIN.getKey()).setUuid(MAIN.getUuid())).getMainBranchComponent(); ComponentDto component = ComponentTesting.newBranchComponent(mainComponent, new BranchDto() .setUuid(PR1.getUuid()) .setKey(PR1.getKey()) @@ -236,7 +236,7 @@ public class BranchPersisterImplIT { analysisMetadataHolder.setProject(PROJECT); analysisMetadataHolder.setBranch(createBranch(BRANCH, false, "BRANCH_KEY")); treeRootHolder.setRoot(BRANCH1); - ComponentDto mainComponent = dbTester.components().insertPublicProject(p -> p.setKey(MAIN.getKey()).setUuid(MAIN.getUuid())); + ComponentDto mainComponent = dbTester.components().insertPublicProject(p -> p.setKey(MAIN.getKey()).setUuid(MAIN.getUuid())).getMainBranchComponent(); ComponentDto component = ComponentTesting.newBranchComponent(mainComponent, new BranchDto().setUuid(BRANCH1.getUuid()).setKey(BRANCH1.getKey()).setBranchType(BRANCH)); dbTester.getDbClient().componentDao().insert(dbTester.getSession(), component, false); diff --git a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/component/ComponentUuidFactoryImplIT.java b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/component/ComponentUuidFactoryImplIT.java index 710f3883ad5..6b3ee0a9d70 100644 --- a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/component/ComponentUuidFactoryImplIT.java +++ b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/component/ComponentUuidFactoryImplIT.java @@ -41,7 +41,7 @@ public class ComponentUuidFactoryImplIT { @Test public void getOrCreateForKey_when_existingComponentsInDbForMainBranch_should_load() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentUuidFactory underTest = new ComponentUuidFactoryImpl(db.getDbClient(), db.getSession(), project.getKey(), mainBranch); @@ -50,7 +50,7 @@ public class ComponentUuidFactoryImplIT { @Test public void getOrCreateForKey_when_existingComponentsInDbForNonMainBranch_should_load() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto branch = db.components().insertProjectBranch(project, b -> b.setKey("b1")); when(mockedBranch.getType()).thenReturn(BranchType.BRANCH); when(mockedBranch.isMain()).thenReturn(false); @@ -63,7 +63,7 @@ public class ComponentUuidFactoryImplIT { @Test public void getOrCreateForKey_when_existingComponentsInDbForPr_should_load() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto pr = db.components().insertProjectBranch(project, b -> b.setBranchType(BranchType.PULL_REQUEST).setKey("pr1")); when(mockedBranch.getType()).thenReturn(BranchType.PULL_REQUEST); when(mockedBranch.isMain()).thenReturn(false); diff --git a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/component/ProjectPersisterIT.java b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/component/ProjectPersisterIT.java index a2ff4f3a67c..23e06bc3a77 100644 --- a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/component/ProjectPersisterIT.java +++ b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/component/ProjectPersisterIT.java @@ -74,8 +74,8 @@ public class ProjectPersisterIT { @Test public void update_description() { - ProjectDto p1 = dbTester.components().insertPublicProjectDto( - c -> c.setUuid("PROJECT_UUID").setKey(ROOT.getKey()).setName(ROOT.getName()).setDescription("OLD_DESC")); + ProjectDto p1 = dbTester.components().insertPublicProject( + c -> c.setUuid("PROJECT_UUID").setKey(ROOT.getKey()).setName(ROOT.getName()).setDescription("OLD_DESC")).getProjectDto(); assertProject("OLD_DESC", ROOT.getName(), p1.getUpdatedAt()); underTest.persist(dbTester.getSession()); @@ -84,8 +84,8 @@ public class ProjectPersisterIT { @Test public void update_name() { - ProjectDto p1 = dbTester.components().insertPublicProjectDto( - c -> c.setUuid("PROJECT_UUID").setKey(ROOT.getKey()).setName("OLD_NAME").setDescription(ROOT.getDescription())); + ProjectDto p1 = dbTester.components().insertPublicProject( + c -> c.setUuid("PROJECT_UUID").setKey(ROOT.getKey()).setName("OLD_NAME").setDescription(ROOT.getDescription())).getProjectDto(); assertProject(ROOT.getDescription(), "OLD_NAME", p1.getUpdatedAt()); underTest.persist(dbTester.getSession()); @@ -94,8 +94,8 @@ public class ProjectPersisterIT { @Test public void dont_update() { - ProjectDto p1 = dbTester.components().insertPublicProjectDto( - c -> c.setUuid("PROJECT_UUID").setKey(ROOT.getKey()).setName(ROOT.getName()).setDescription(ROOT.getDescription())); + ProjectDto p1 = dbTester.components().insertPublicProject( + c -> c.setUuid("PROJECT_UUID").setKey(ROOT.getKey()).setName(ROOT.getName()).setDescription(ROOT.getDescription())).getProjectDto(); assertProject(ROOT.getDescription(), ROOT.getName(), p1.getUpdatedAt()); underTest.persist(dbTester.getSession()); diff --git a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/component/ReferenceBranchComponentUuidsIT.java b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/component/ReferenceBranchComponentUuidsIT.java index 147cfc8f5c1..e899db1ea63 100644 --- a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/component/ReferenceBranchComponentUuidsIT.java +++ b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/component/ReferenceBranchComponentUuidsIT.java @@ -62,7 +62,7 @@ public class ReferenceBranchComponentUuidsIT { analysisMetadataHolder.setProject(project); analysisMetadataHolder.setBranch(branch); - ComponentDto projectDto = db.components().insertPublicProject(); + ComponentDto projectDto = db.components().insertPublicProject().getMainBranchComponent(); when(project.getUuid()).thenReturn(projectDto.uuid()); branch1 = db.components().insertProjectBranch(projectDto, b -> b.setKey("branch1")); branch2 = db.components().insertProjectBranch(projectDto, b -> b.setKey("branch2")); diff --git a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/component/SiblingComponentsWithOpenIssuesIT.java b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/component/SiblingComponentsWithOpenIssuesIT.java index 1e9fa01615b..98d4c7880bc 100644 --- a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/component/SiblingComponentsWithOpenIssuesIT.java +++ b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/component/SiblingComponentsWithOpenIssuesIT.java @@ -64,7 +64,7 @@ public class SiblingComponentsWithOpenIssuesIT { @Before public void setUp() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); metadataHolder.setProject(new Project(project.uuid(), project.getKey(), project.name(), project.description(), Collections.emptyList())); branch1 = db.components().insertProjectBranch(project, b -> b.setKey("branch1"), b -> b.setBranchType(BranchType.BRANCH)); @@ -158,7 +158,7 @@ public class SiblingComponentsWithOpenIssuesIT { @Test public void should_find_sibling_components_with_open_issues_from_pullrequest() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); setRoot(project); setBranch(BranchType.BRANCH); @@ -177,7 +177,7 @@ public class SiblingComponentsWithOpenIssuesIT { @Test public void should_not_find_sibling_components_on_derived_branch() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); setRoot(project); setBranch(BranchType.BRANCH); diff --git a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/filemove/FileMoveDetectionStepIT.java b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/filemove/FileMoveDetectionStepIT.java index 57e9b7397bc..6a83f4ce017 100644 --- a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/filemove/FileMoveDetectionStepIT.java +++ b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/filemove/FileMoveDetectionStepIT.java @@ -238,7 +238,7 @@ public class FileMoveDetectionStepIT { @Before public void setUp() throws Exception { logTester.setLevel(Level.DEBUG); - project = dbTester.components().insertPrivateProject(); + project = dbTester.components().insertPrivateProject().getMainBranchComponent(); treeRootHolder.setRoot(builder(Component.Type.PROJECT, ROOT_REF).setUuid(project.uuid()).build()); } diff --git a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/filemove/PullRequestFileMoveDetectionStepIT.java b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/filemove/PullRequestFileMoveDetectionStepIT.java index 4c86e49cadc..3effd77ae17 100644 --- a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/filemove/PullRequestFileMoveDetectionStepIT.java +++ b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/filemove/PullRequestFileMoveDetectionStepIT.java @@ -98,7 +98,7 @@ public class PullRequestFileMoveDetectionStepIT { @Before public void setUp() throws Exception { - project = dbTester.components().insertPrivateProject(); + project = dbTester.components().insertPrivateProject().getMainBranchComponent(); branch = dbTester.components().insertProjectBranch(project, branchDto -> branchDto.setUuid(BRANCH_UUID).setKey(TARGET_BRANCH)); treeRootHolder.setRoot(builder(Component.Type.PROJECT, Integer.parseInt(ROOT_REF)).setUuid(project.uuid()).build()); } diff --git a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/issue/ComponentIssuesLoaderIT.java b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/issue/ComponentIssuesLoaderIT.java index 364a984fba0..96e634feadc 100644 --- a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/issue/ComponentIssuesLoaderIT.java +++ b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/issue/ComponentIssuesLoaderIT.java @@ -77,7 +77,7 @@ public class ComponentIssuesLoaderIT { @Test public void loadClosedIssues_returns_single_DefaultIssue_by_issue_based_on_first_row() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(ComponentTesting.newFileDto(project)); RuleDto rule = db.rules().insert(t -> t.setType(CODE_SMELL)); Date issueDate = addDays(NOW, -10); @@ -96,7 +96,7 @@ public class ComponentIssuesLoaderIT { @Test public void loadClosedIssues_returns_single_DefaultIssue_with_null_line_if_first_row_has_no_line_diff() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(ComponentTesting.newFileDto(project)); RuleDto rule = db.rules().insert(t -> t.setType(CODE_SMELL)); Date issueDate = addDays(NOW, -10); @@ -115,7 +115,7 @@ public class ComponentIssuesLoaderIT { @Test public void loadClosedIssues_returns_only_closed_issues_with_close_date() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(ComponentTesting.newFileDto(project)); RuleDto rule = db.rules().insert(t -> t.setType(CODE_SMELL)); Date issueDate = addDays(NOW, -10); @@ -183,7 +183,7 @@ public class ComponentIssuesLoaderIT { } private void loadClosedIssues_returns_only_closed_issues_with_close_date_is_from_30_days_ago(ComponentIssuesLoader underTest) { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(ComponentTesting.newFileDto(project)); RuleDto rule = db.rules().insert(t -> t.setType(CODE_SMELL)); Date[] issueDates = new Date[] { diff --git a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/issue/ProjectTrackerBaseLazyInputIT.java b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/issue/ProjectTrackerBaseLazyInputIT.java index 871ba920827..a2b3e3db5cf 100644 --- a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/issue/ProjectTrackerBaseLazyInputIT.java +++ b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/issue/ProjectTrackerBaseLazyInputIT.java @@ -65,7 +65,7 @@ public class ProjectTrackerBaseLazyInputIT { public void prepare() { rule = dbTester.rules().insert(); ruleRepositoryRule.add(rule.getKey()); - rootProjectDto = dbTester.components().insertPublicProject(); + rootProjectDto = dbTester.components().insertPublicProject().getMainBranchComponent(); ReportComponent rootProject = ReportComponent.builder(Component.Type.FILE, 1) .setKey(rootProjectDto.getKey()) .setUuid(rootProjectDto.uuid()).build(); diff --git a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/issue/SiblingsIssueMergerIT.java b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/issue/SiblingsIssueMergerIT.java index ccc993af92f..9c38acb8216 100644 --- a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/issue/SiblingsIssueMergerIT.java +++ b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/issue/SiblingsIssueMergerIT.java @@ -105,7 +105,7 @@ public class SiblingsIssueMergerIT { copier = new SiblingsIssueMerger(new SiblingsIssuesLoader(new SiblingComponentsWithOpenIssues(treeRootHolder, metadataHolder, dbClient), dbClient, componentIssuesLoader), tracker, issueLifecycle); - projectDto = db.components().insertPublicProject(p -> p.setKey(PROJECT_KEY).setUuid(PROJECT_UUID)); + projectDto = db.components().insertPublicProject(p -> p.setKey(PROJECT_KEY).setUuid(PROJECT_UUID)).getMainBranchComponent(); branch1Dto = db.components().insertProjectBranch(projectDto, b -> b.setKey("myBranch1") .setBranchType(BranchType.PULL_REQUEST) .setMergeBranchUuid(projectDto.uuid())); diff --git a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/issue/SourceBranchComponentUuidsIT.java b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/issue/SourceBranchComponentUuidsIT.java index e6b60e48f58..ac0780a87db 100644 --- a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/issue/SourceBranchComponentUuidsIT.java +++ b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/issue/SourceBranchComponentUuidsIT.java @@ -60,7 +60,7 @@ public class SourceBranchComponentUuidsIT { analysisMetadataHolder.setProject(project); analysisMetadataHolder.setBranch(branch); - ComponentDto projectDto = db.components().insertPublicProject(); + ComponentDto projectDto = db.components().insertPublicProject().getMainBranchComponent(); when(project.getUuid()).thenReturn(projectDto.uuid()); branch1 = db.components().insertProjectBranch(projectDto, b -> b.setKey(BRANCH_KEY)); ComponentDto pr1branch = db.components().insertProjectBranch(projectDto, b -> b.setKey(PR_KEY) diff --git a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/issue/TargetBranchComponentUuidsIT.java b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/issue/TargetBranchComponentUuidsIT.java index 9961070a8ed..14800d42f64 100644 --- a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/issue/TargetBranchComponentUuidsIT.java +++ b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/issue/TargetBranchComponentUuidsIT.java @@ -59,7 +59,7 @@ public class TargetBranchComponentUuidsIT { analysisMetadataHolder.setProject(project); analysisMetadataHolder.setBranch(branch); - ComponentDto projectDto = db.components().insertPublicProject(); + ComponentDto projectDto = db.components().insertPublicProject().getMainBranchComponent(); when(project.getUuid()).thenReturn(projectDto.uuid()); branch1 = db.components().insertProjectBranch(projectDto, b -> b.setKey(BRANCH_KEY)); ComponentDto pr1branch = db.components().insertProjectBranch(projectDto, b -> b.setKey(PR_KEY) diff --git a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/measure/MeasureRepositoryImplIT.java b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/measure/MeasureRepositoryImplIT.java index 3a0953cba8a..5412d9a16f9 100644 --- a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/measure/MeasureRepositoryImplIT.java +++ b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/measure/MeasureRepositoryImplIT.java @@ -138,7 +138,7 @@ public class MeasureRepositoryImplIT { @Test public void getBaseMeasure_returns_Measure_if_measure_of_last_snapshot_only_in_DB() { - ComponentDto project = dbTester.components().insertPrivateProject(); + ComponentDto project = dbTester.components().insertPrivateProject().getMainBranchComponent(); dbTester.components().insertComponent(newFileDto(project).setUuid(FILE_COMPONENT.getUuid())); SnapshotDto lastAnalysis = dbTester.components().insertSnapshot(project, t -> t.setLast(true)); SnapshotDto oldAnalysis = dbTester.components().insertSnapshot(project, t -> t.setLast(false)); diff --git a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/period/NewCodeReferenceBranchComponentUuidsIT.java b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/period/NewCodeReferenceBranchComponentUuidsIT.java index 0e98bfebfa8..cfd395fb7c2 100644 --- a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/period/NewCodeReferenceBranchComponentUuidsIT.java +++ b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/period/NewCodeReferenceBranchComponentUuidsIT.java @@ -61,7 +61,7 @@ public class NewCodeReferenceBranchComponentUuidsIT { public void setUp() { analysisMetadataHolder.setProject(project); - ComponentDto projectDto = db.components().insertPublicProject(); + ComponentDto projectDto = db.components().insertPublicProject().getMainBranchComponent(); when(project.getUuid()).thenReturn(projectDto.uuid()); branch1 = db.components().insertProjectBranch(projectDto, b -> b.setKey("branch1")); branch2 = db.components().insertProjectBranch(projectDto, b -> b.setKey("branch2")); diff --git a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/source/DbLineHashVersionIT.java b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/source/DbLineHashVersionIT.java index bae16318b31..3a11cf9fc76 100644 --- a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/source/DbLineHashVersionIT.java +++ b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/source/DbLineHashVersionIT.java @@ -45,7 +45,7 @@ public class DbLineHashVersionIT { @Test public void hasLineHashWithSignificantCode_should_return_true() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(ComponentTesting.newFileDto(project)); db.fileSources().insertFileSource(file, dto -> dto.setLineHashesVersion(LineHashVersion.WITH_SIGNIFICANT_CODE.getDbValue())); @@ -71,7 +71,7 @@ public class DbLineHashVersionIT { @Test public void hasLineHashWithSignificantCode_should_return_false_if_pr_reference_has_file_but_it_is_not_in_db() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(ComponentTesting.newFileDto(project)); when(analysisMetadataHolder.isPullRequest()).thenReturn(true); @@ -86,7 +86,7 @@ public class DbLineHashVersionIT { @Test public void hasLineHashWithSignificantCode_should_return_true_if_pr_reference_has_file_and_it_is_in_db() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(ComponentTesting.newFileDto(project)); db.fileSources().insertFileSource(file, dto -> dto.setLineHashesVersion(LineHashVersion.WITH_SIGNIFICANT_CODE.getDbValue())); @@ -102,7 +102,7 @@ public class DbLineHashVersionIT { @Test public void should_cache_line_hash_version_from_db() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(ComponentTesting.newFileDto(project)); db.fileSources().insertFileSource(file, dto -> dto.setLineHashesVersion(LineHashVersion.WITH_SIGNIFICANT_CODE.getDbValue())); diff --git a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/BuildComponentTreeStepIT.java b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/BuildComponentTreeStepIT.java index f126df4a223..568abd860bb 100644 --- a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/BuildComponentTreeStepIT.java +++ b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/BuildComponentTreeStepIT.java @@ -233,7 +233,7 @@ public class BuildComponentTreeStepIT { @Test public void return_existing_uuids() { setAnalysisMetadataHolder(); - ComponentDto project = dbTester.components().insertPrivateProject("ABCD", p -> p.setKey(REPORT_PROJECT_KEY)); + ComponentDto project = dbTester.components().insertPrivateProject("ABCD", p -> p.setKey(REPORT_PROJECT_KEY)).getMainBranchComponent(); ComponentDto directory = newDirectory(project, "CDEF", REPORT_DIR_PATH_1); insertComponent(directory.setKey(REPORT_PROJECT_KEY + ":" + REPORT_DIR_PATH_1)); insertComponent(newFileDto(project, directory, "DEFG") @@ -273,7 +273,7 @@ public class BuildComponentTreeStepIT { @Test public void generate_keys_when_using_existing_branch() { - ComponentDto projectDto = dbTester.components().insertPublicProject(); + ComponentDto projectDto = dbTester.components().insertPublicProject().getMainBranchComponent(); String branchName = randomAlphanumeric(248); ComponentDto componentDto = dbTester.components().insertProjectBranch(projectDto, b -> b.setKey(branchName)); Branch branch = mock(Branch.class); @@ -359,7 +359,7 @@ public class BuildComponentTreeStepIT { @Test public void set_base_project_snapshot_when_last_snapshot_exist() { setAnalysisMetadataHolder(); - ComponentDto project = dbTester.components().insertPrivateProject("ABCD", p -> p.setKey(REPORT_PROJECT_KEY)); + ComponentDto project = dbTester.components().insertPrivateProject("ABCD", p -> p.setKey(REPORT_PROJECT_KEY)).getMainBranchComponent(); insertSnapshot(newAnalysis(project).setLast(true)); reportReader.putComponent(component(ROOT_REF, PROJECT, REPORT_PROJECT_KEY)); @@ -382,7 +382,7 @@ public class BuildComponentTreeStepIT { @UseDataProvider("oneParameterNullNonNullCombinations") public void set_projectVersion_to_previous_analysis_when_not_set(@Nullable String previousAnalysisProjectVersion) { setAnalysisMetadataHolder(); - ComponentDto project = dbTester.components().insertPrivateProject("ABCD", p -> p.setKey(REPORT_PROJECT_KEY)); + ComponentDto project = dbTester.components().insertPrivateProject("ABCD", p -> p.setKey(REPORT_PROJECT_KEY)).getMainBranchComponent(); insertSnapshot(newAnalysis(project).setProjectVersion(previousAnalysisProjectVersion).setLast(true)); reportReader.putComponent(component(ROOT_REF, PROJECT, REPORT_PROJECT_KEY)); diff --git a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/LoadFileHashesAndStatusStepIT.java b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/LoadFileHashesAndStatusStepIT.java index ea7043bd8c7..a81d08fab74 100644 --- a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/LoadFileHashesAndStatusStepIT.java +++ b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/LoadFileHashesAndStatusStepIT.java @@ -68,8 +68,8 @@ public class LoadFileHashesAndStatusStepIT { @Test public void loads_file_hashes_for_project_branch() { - ComponentDto project1 = db.components().insertPublicProject(); - ComponentDto project2 = db.components().insertPublicProject(); + ComponentDto project1 = db.components().insertPublicProject().getMainBranchComponent(); + ComponentDto project2 = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto dbFile1 = db.components().insertComponent(ComponentTesting.newFileDto(project1)); ComponentDto dbFile2 = db.components().insertComponent(ComponentTesting.newFileDto(project1)); @@ -96,7 +96,7 @@ public class LoadFileHashesAndStatusStepIT { @Test public void loads_high_number_of_files() { - ComponentDto project1 = db.components().insertPublicProject(); + ComponentDto project1 = db.components().insertPublicProject().getMainBranchComponent(); List files = new ArrayList<>(2000); for (int i = 0; i < 2000; i++) { diff --git a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/LoadPeriodsStepIT.java b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/LoadPeriodsStepIT.java index 0c8e8031f8d..3b603c1c055 100644 --- a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/LoadPeriodsStepIT.java +++ b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/LoadPeriodsStepIT.java @@ -38,9 +38,7 @@ import org.junit.runner.RunWith; import org.slf4j.event.Level; import org.sonar.api.utils.MessageException; import org.sonar.api.utils.System2; -import org.sonar.api.testfixtures.log.LogAndArguments; import org.sonar.api.testfixtures.log.LogTester; -import org.sonar.api.utils.log.LoggerLevel; import org.sonar.ce.task.log.CeTaskMessages; import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolder; import org.sonar.ce.task.projectanalysis.component.Component; @@ -104,7 +102,7 @@ public class LoadPeriodsStepIT extends BaseStepTest { @Before public void setUp() { logTester.setLevel(Level.TRACE); - project = dbTester.components().insertPublicProject(); + project = dbTester.components().insertPublicProject().getMainBranchComponent(); when(analysisMetadataHolder.isBranch()).thenReturn(true); when(analysisMetadataHolder.isFirstAnalysis()).thenReturn(false); @@ -312,7 +310,7 @@ public class LoadPeriodsStepIT extends BaseStepTest { @Test public void throw_ISE_when_specific_analysis_is_set_but_does_not_exist_in_DB() { - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); setProjectPeriod(project.uuid(), NewCodePeriodType.SPECIFIC_ANALYSIS, "nonexistent"); setupRoot(project, project.uuid(), "any-string"); @@ -323,7 +321,7 @@ public class LoadPeriodsStepIT extends BaseStepTest { @Test public void throw_ISE_when_specific_analysis_is_set_but_does_not_belong_to_current_project() { - ComponentDto otherProject = dbTester.components().insertPublicProject(); + ComponentDto otherProject = dbTester.components().insertPublicProject().getMainBranchComponent(); SnapshotDto otherProjectAnalysis = dbTester.components().insertSnapshot(otherProject); setBranchPeriod(project.uuid(), project.uuid(), NewCodePeriodType.SPECIFIC_ANALYSIS, otherProjectAnalysis.getUuid()); setupRoot(project); diff --git a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/LoadReportAnalysisMetadataHolderStepIT.java b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/LoadReportAnalysisMetadataHolderStepIT.java index 17591696f93..4abac1ca8f5 100644 --- a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/LoadReportAnalysisMetadataHolderStepIT.java +++ b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/LoadReportAnalysisMetadataHolderStepIT.java @@ -77,7 +77,7 @@ public class LoadReportAnalysisMetadataHolderStepIT { public void setUp() { CeTask defaultOrgCeTask = createCeTask(PROJECT_KEY); underTest = createStep(defaultOrgCeTask); - project = db.components().insertPublicProject(p -> p.setKey(PROJECT_KEY)); + project = db.components().insertPublicProject(p -> p.setKey(PROJECT_KEY)).getMainBranchComponent(); } @Test @@ -213,7 +213,7 @@ public class LoadReportAnalysisMetadataHolderStepIT { @Test public void execute_fails_with_MessageException_when_projectKey_in_report_is_different_from_componentKey_in_CE_task() { - ComponentDto otherProject = db.components().insertPublicProject(); + ComponentDto otherProject = db.components().insertPublicProject().getMainBranchComponent(); reportReader.setMetadata( ScannerReport.Metadata.newBuilder() .setProjectKey(otherProject.getKey()) @@ -227,7 +227,7 @@ public class LoadReportAnalysisMetadataHolderStepIT { @Test public void execute_sets_branch_even_if_MessageException_is_thrown_because_projectKey_in_report_is_different_from_componentKey_in_CE_task() { - ComponentDto otherProject = db.components().insertPublicProject(); + ComponentDto otherProject = db.components().insertPublicProject().getMainBranchComponent(); reportReader.setMetadata( ScannerReport.Metadata.newBuilder() .setProjectKey(otherProject.getKey()) @@ -242,7 +242,7 @@ public class LoadReportAnalysisMetadataHolderStepIT { @Test public void execute_sets_analysis_date_even_if_MessageException_is_thrown_because_projectKey_is_different_from_componentKey_in_CE_task() { - ComponentDto otherProject = db.components().insertPublicProject(); + ComponentDto otherProject = db.components().insertPublicProject().getMainBranchComponent(); reportReader.setMetadata( ScannerReport.Metadata.newBuilder() .setProjectKey(otherProject.getKey()) @@ -258,7 +258,7 @@ public class LoadReportAnalysisMetadataHolderStepIT { @Test public void execute_does_not_fail_when_report_has_a_quality_profile_that_does_not_exist_anymore() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ScannerReport.Metadata.Builder metadataBuilder = newBatchReportBuilder(); metadataBuilder .setProjectKey(project.getKey()); diff --git a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/PersistEventsStepIT.java b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/PersistEventsStepIT.java index b900fc3368e..49afbd06a90 100644 --- a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/PersistEventsStepIT.java +++ b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/PersistEventsStepIT.java @@ -188,7 +188,7 @@ public class PersistEventsStepIT extends BaseStepTest { @Test public void keep_one_event_by_version() { - ComponentDto projectDto = dbTester.components().insertPublicProject(); + ComponentDto projectDto = dbTester.components().insertPublicProject().getMainBranchComponent(); EventDto[] existingEvents = new EventDto[] { dbTester.events().insertEvent(newVersionEventDto(projectDto, 120_000_000L, "1.3-SNAPSHOT")), dbTester.events().insertEvent(newVersionEventDto(projectDto, 130_000_000L, "1.4")), diff --git a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/PersistIssuesStepIT.java b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/PersistIssuesStepIT.java index ed30205c8ab..4c97694f98b 100644 --- a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/PersistIssuesStepIT.java +++ b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/PersistIssuesStepIT.java @@ -120,7 +120,7 @@ public class PersistIssuesStepIT extends BaseStepTest { public void insert_copied_issue() { RuleDto rule = RuleTesting.newRule(RuleKey.of("xoo", "S01")); db.rules().insert(rule); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); when(system2.now()).thenReturn(NOW); String issueKey = "ISSUE-1"; @@ -184,7 +184,7 @@ public class PersistIssuesStepIT extends BaseStepTest { RuleDto rule = RuleTesting.newRule(RuleKey.of("xoo", "S01")); db.rules().insert(rule); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); when(system2.now()).thenReturn(NOW); String issueKey = "ISSUE-2"; @@ -230,7 +230,7 @@ public class PersistIssuesStepIT extends BaseStepTest { periodHolder.setPeriod(new Period(NewCodePeriodType.REFERENCE_BRANCH.name(), "master", null)); RuleDto rule = RuleTesting.newRule(RuleKey.of("xoo", "S01")); db.rules().insert(rule); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); when(system2.now()).thenReturn(NOW); String issueKey = "ISSUE-3"; @@ -289,7 +289,7 @@ public class PersistIssuesStepIT extends BaseStepTest { public void update_conflicting_issue() { RuleDto rule = RuleTesting.newRule(RuleKey.of("xoo", "S01")); db.rules().insert(rule); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); IssueDto issue = db.issues().insert(rule, project, file, i -> i.setStatus(STATUS_OPEN) @@ -324,7 +324,7 @@ public class PersistIssuesStepIT extends BaseStepTest { periodHolder.setPeriod(new Period(NewCodePeriodType.REFERENCE_BRANCH.name(), "master", null)); RuleDto rule = RuleTesting.newRule(RuleKey.of("xoo", "S01")); db.rules().insert(rule); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); session.commit(); String issueKey = "ISSUE-4"; @@ -362,7 +362,7 @@ public class PersistIssuesStepIT extends BaseStepTest { @Test public void close_issue() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); RuleDto rule = db.rules().insert(); IssueDto issue = db.issues().insert(rule, project, file, @@ -396,7 +396,7 @@ public class PersistIssuesStepIT extends BaseStepTest { periodHolder.setPeriod(new Period(NewCodePeriodType.REFERENCE_BRANCH.name(), "master", null)); RuleDto rule = RuleTesting.newRule(RuleKey.of("xoo", "S01")); db.rules().insert(rule); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); when(system2.now()).thenReturn(NOW); String issueKey = "ISSUE-5"; @@ -449,7 +449,7 @@ public class PersistIssuesStepIT extends BaseStepTest { periodHolder.setPeriod(new Period(NewCodePeriodType.REFERENCE_BRANCH.name(), "master", null)); RuleDto rule = RuleTesting.newRule(RuleKey.of("xoo", "S01")); db.rules().insert(rule); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); when(system2.now()).thenReturn(NOW); String issueKey = "ISSUE-6"; @@ -498,7 +498,7 @@ public class PersistIssuesStepIT extends BaseStepTest { periodHolder.setPeriod(new Period(NewCodePeriodType.REFERENCE_BRANCH.name(), "master", null)); RuleDto rule = RuleTesting.newRule(RuleKey.of("xoo", "S01")); db.rules().insert(rule); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); when(system2.now()).thenReturn(NOW); String issueKey = "ISSUE-7"; @@ -549,7 +549,7 @@ public class PersistIssuesStepIT extends BaseStepTest { @Test public void add_comment() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); RuleDto rule = db.rules().insert(); IssueDto issue = db.issues().insert(rule, project, file, @@ -590,7 +590,7 @@ public class PersistIssuesStepIT extends BaseStepTest { @Test public void add_change() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); RuleDto rule = db.rules().insert(); IssueDto issue = db.issues().insert(rule, project, file, diff --git a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/PersistProjectLinksStepIT.java b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/PersistProjectLinksStepIT.java index 2537a63dbfc..ea448818e29 100644 --- a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/PersistProjectLinksStepIT.java +++ b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/PersistProjectLinksStepIT.java @@ -115,7 +115,7 @@ public class PersistProjectLinksStepIT extends BaseStepTest { @Test public void nothing_to_do_when_link_already_exists() { mockBranch(true); - ComponentDto project = db.components().insertPrivateProject(p -> p.setUuid("ABCD")); + ComponentDto project = db.components().insertPrivateProject(p -> p.setUuid("ABCD")).getMainBranchComponent(); db.componentLinks().insertProvidedLink(project, l -> l.setType("homepage").setName("Home").setHref("http://www.sonarqube.org")); treeRootHolder.setRoot(ReportComponent.builder(Component.Type.PROJECT, 1).setUuid("ABCD").build()); @@ -179,7 +179,7 @@ public class PersistProjectLinksStepIT extends BaseStepTest { @Test public void update_link() { mockBranch(true); - ComponentDto project = db.components().insertPrivateProject(p -> p.setUuid("ABCD")); + ComponentDto project = db.components().insertPrivateProject(p -> p.setUuid("ABCD")).getMainBranchComponent(); db.componentLinks().insertProvidedLink(project, l -> l.setType("homepage").setName("Home").setHref("http://www.sonar.org")); treeRootHolder.setRoot(ReportComponent.builder(Component.Type.PROJECT, 1).setUuid("ABCD").build()); @@ -200,7 +200,7 @@ public class PersistProjectLinksStepIT extends BaseStepTest { @Test public void delete_link() { mockBranch(true); - ComponentDto project = db.components().insertPrivateProject(p -> p.setUuid("ABCD")); + ComponentDto project = db.components().insertPrivateProject(p -> p.setUuid("ABCD")).getMainBranchComponent(); db.componentLinks().insertProvidedLink(project, l -> l.setType("homepage").setName("Home").setHref("http://www.sonar.org")); treeRootHolder.setRoot(ReportComponent.builder(Component.Type.PROJECT, 1).setUuid("ABCD").build()); @@ -218,7 +218,7 @@ public class PersistProjectLinksStepIT extends BaseStepTest { @Test public void not_delete_custom_link() { mockBranch(true); - ComponentDto project = db.components().insertPrivateProject(p -> p.setUuid("ABCD")); + ComponentDto project = db.components().insertPrivateProject(p -> p.setUuid("ABCD")).getMainBranchComponent(); db.componentLinks().insertCustomLink(project); treeRootHolder.setRoot(ReportComponent.builder(Component.Type.PROJECT, 1).setUuid("ABCD").build()); diff --git a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/PersistPushEventsStepIT.java b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/PersistPushEventsStepIT.java index 6973956fe8f..8ae97ad8528 100644 --- a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/PersistPushEventsStepIT.java +++ b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/PersistPushEventsStepIT.java @@ -143,7 +143,7 @@ public class PersistPushEventsStepIT { @Test public void store_push_events_for_branch() { - var project = db.components().insertPrivateProject(); + var project = db.components().insertPrivateProject().getMainBranchComponent(); db.components().insertProjectBranch(project, b -> b.setUuid("uuid_1")); protoIssueCache.newAppender() diff --git a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/ProjectNclocComputationStepIT.java b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/ProjectNclocComputationStepIT.java index 38c925fb7ff..16f47518a2a 100644 --- a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/ProjectNclocComputationStepIT.java +++ b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/ProjectNclocComputationStepIT.java @@ -47,7 +47,7 @@ public class ProjectNclocComputationStepIT { @Test public void test_computing_branch_ncloc() { MetricDto ncloc = db.measures().insertMetric(m -> m.setKey("ncloc").setValueType(INT.toString())); - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto branch1 = db.components().insertProjectBranch(project, b -> b.setBranchType(BranchType.BRANCH)); db.measures().insertLiveMeasure(branch1, ncloc, m -> m.setValue(200d)); ComponentDto branch2 = db.components().insertProjectBranch(project, b -> b.setBranchType(BranchType.BRANCH)); @@ -62,4 +62,4 @@ public class ProjectNclocComputationStepIT { public void description_is_not_missing() { assertThat(step.getDescription()).isNotBlank(); } -} \ No newline at end of file +} diff --git a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/ReportPersistComponentsStepIT.java b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/ReportPersistComponentsStepIT.java index 2f6d81ff368..e7d791ea682 100644 --- a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/ReportPersistComponentsStepIT.java +++ b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/ReportPersistComponentsStepIT.java @@ -21,7 +21,6 @@ package org.sonar.ce.task.projectanalysis.step; import java.text.SimpleDateFormat; import java.util.Date; -import java.util.List; import java.util.Optional; import java.util.Set; import java.util.function.Consumer; @@ -495,14 +494,14 @@ public class ReportPersistComponentsStepIT extends BaseStepTest { } private ComponentDto prepareProject(Consumer populators) { - ComponentDto dto = db.components().insertPrivateProject(populators); + ComponentDto dto = db.components().insertPrivateProject(populators).getMainBranchComponent(); analysisMetadataHolder.setProject(Project.from(dto)); analysisMetadataHolder.setBranch(new DefaultBranchImpl(DEFAULT_MAIN_BRANCH_NAME)); return dto; } private ComponentDto prepareBranch(String branchName) { - ComponentDto projectDto = db.components().insertPublicProject(); + ComponentDto projectDto = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto branchDto = db.components().insertProjectBranch(projectDto, b -> b.setKey(branchName)); analysisMetadataHolder.setProject(Project.from(projectDto)); analysisMetadataHolder.setBranch(new TestBranch(branchName)); diff --git a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/SendIssueNotificationsStepIT.java b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/SendIssueNotificationsStepIT.java index 0f898673c43..c048f544747 100644 --- a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/SendIssueNotificationsStepIT.java +++ b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/SendIssueNotificationsStepIT.java @@ -705,7 +705,7 @@ public class SendIssueNotificationsStepIT extends BaseStepTest { if(branchType == PULL_REQUEST) { branch = newBranchComponent(project, newBranchDto(project, PULL_REQUEST, project.uuid())); } else { - branch = newBranchComponent(project, newMainBranchDto(project).setKey(BRANCH_NAME)); + branch = newBranchComponent(project, newMainBranchDto(project, project.uuid()).setKey(BRANCH_NAME)); } ComponentDto file = newFileDto(branch, project.uuid()); treeRootHolder.setRoot(builder(Type.PROJECT, 2).setKey(branch.getKey()).setName(branch.longName()).setUuid(branch.uuid()).addChildren( diff --git a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/UpdateNeedIssueSyncStepIT.java b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/UpdateNeedIssueSyncStepIT.java index 07ca29aaf72..99ef5311432 100644 --- a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/UpdateNeedIssueSyncStepIT.java +++ b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/UpdateNeedIssueSyncStepIT.java @@ -49,7 +49,7 @@ public class UpdateNeedIssueSyncStepIT { @Test public void analysis_step_updates_need_issue_sync_flag() { ComponentDto project = db.components() - .insertPrivateProject(c -> c.setUuid(PROJECT.getUuid()).setKey(PROJECT.getKey())); + .insertPrivateProject(c -> c.setUuid(PROJECT.getUuid()).setKey(PROJECT.getKey())).getMainBranchComponent(); dbClient.branchDao().updateNeedIssueSync(db.getSession(), PROJECT.getUuid(), true); db.getSession().commit(); diff --git a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/ValidateProjectStepIT.java b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/ValidateProjectStepIT.java index d9f5a716443..bdb52642505 100644 --- a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/ValidateProjectStepIT.java +++ b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/ValidateProjectStepIT.java @@ -66,7 +66,7 @@ public class ValidateProjectStepIT { @Test public void not_fail_if_analysis_date_is_after_last_analysis() { - ComponentDto project = db.components().insertPrivateProject("ABCD", c -> c.setKey(PROJECT_KEY)); + ComponentDto project = db.components().insertPrivateProject("ABCD", c -> c.setKey(PROJECT_KEY)).getMainBranchComponent(); dbClient.snapshotDao().insert(db.getSession(), SnapshotTesting.newAnalysis(project).setCreatedAt(PAST_ANALYSIS_TIME)); db.getSession().commit(); @@ -79,7 +79,7 @@ public class ValidateProjectStepIT { public void fail_if_analysis_date_is_before_last_analysis() { analysisMetadataHolder.setAnalysisDate(DateUtils.parseDate("2015-01-01")); - ComponentDto project = db.components().insertPrivateProject("ABCD", c -> c.setKey(PROJECT_KEY)); + ComponentDto project = db.components().insertPrivateProject("ABCD", c -> c.setKey(PROJECT_KEY)).getMainBranchComponent(); dbClient.snapshotDao().insert(db.getSession(), SnapshotTesting.newAnalysis(project).setCreatedAt(1433131200000L)); // 2015-06-01 db.getSession().commit(); @@ -95,7 +95,7 @@ public class ValidateProjectStepIT { @Test public void fail_when_project_key_is_invalid() { - ComponentDto project = db.components().insertPrivateProject(p -> p.setKey("inv$lid!")); + ComponentDto project = db.components().insertPrivateProject(p -> p.setKey("inv$lid!")).getMainBranchComponent(); db.components().insertSnapshot(project, a -> a.setCreatedAt(PAST_ANALYSIS_TIME)); treeRootHolder.setRoot(ReportComponent.builder(Component.Type.PROJECT, 1) .setUuid(project.uuid()) diff --git a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/ViewsPersistComponentsStepIT.java b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/ViewsPersistComponentsStepIT.java index 9a1903361b3..c55441a7fc7 100644 --- a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/ViewsPersistComponentsStepIT.java +++ b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/ViewsPersistComponentsStepIT.java @@ -21,13 +21,10 @@ package org.sonar.ce.task.projectanalysis.step; import java.text.SimpleDateFormat; import java.util.Date; -import java.util.List; -import java.util.Map; import java.util.Random; import java.util.stream.Stream; import javax.annotation.Nullable; import org.junit.Before; -import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.sonar.api.resources.Qualifiers; @@ -49,7 +46,6 @@ import org.sonar.ce.task.step.ComputationStep; import org.sonar.ce.task.step.TestComputationStepContext; import org.sonar.db.DbClient; import org.sonar.db.DbTester; -import org.sonar.db.RowNotFoundException; import org.sonar.db.component.ComponentDbTester; import org.sonar.db.component.ComponentDto; import org.sonar.db.component.ComponentTesting; @@ -167,7 +163,7 @@ public class ViewsPersistComponentsStepIT extends BaseStepTest { */ @Test public void execute_whenApplicationDoesNotExistsAndTryingToInsertItInComponentsTable_throwException() { - ComponentDto project = dbTester.components().insertPrivateProject(); + ComponentDto project = dbTester.components().insertPrivateProject().getMainBranchComponent(); treeRootHolder.setRoot( createViewBuilder(APPLICATION) diff --git a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectexport/analysis/ExportAnalysesStepIT.java b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectexport/analysis/ExportAnalysesStepIT.java index c90a2a2a619..eebf642d89c 100644 --- a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectexport/analysis/ExportAnalysesStepIT.java +++ b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectexport/analysis/ExportAnalysesStepIT.java @@ -108,11 +108,11 @@ public class ExportAnalysesStepIT { @Before public void setUp() { logTester.setLevel(Level.DEBUG); - ComponentDto projectDto = dbTester.components().insertPublicProject(PROJECT); + ComponentDto projectDto = dbTester.components().insertPublicProject(PROJECT).getMainBranchComponent(); componentRepository.register(1, projectDto.uuid(), false); dbTester.getDbClient().componentDao().insert(dbTester.getSession(), Set.of(DIR, FILE), true); dbTester.commit(); - when(projectHolder.projectDto()).thenReturn(dbTester.components().getProjectDto(projectDto)); + when(projectHolder.projectDto()).thenReturn(dbTester.components().getProjectDtoByMainBranch(projectDto)); } @Test diff --git a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectexport/branches/ExportBranchesStepIT.java b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectexport/branches/ExportBranchesStepIT.java index 950175a3c30..cd0864a80d4 100644 --- a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectexport/branches/ExportBranchesStepIT.java +++ b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectexport/branches/ExportBranchesStepIT.java @@ -109,13 +109,13 @@ public class ExportBranchesStepIT { public void setUp() { logTester.setLevel(Level.DEBUG); Date createdAt = new Date(); - ComponentDto projectDto = dbTester.components().insertPublicProject(PROJECT).setCreatedAt(createdAt); + ComponentDto projectDto = dbTester.components().insertPublicProject(PROJECT).getMainBranchComponent().setCreatedAt(createdAt); for (BranchDto branch : branches) { createdAt = DateUtils.addMinutes(createdAt, 10); dbTester.components().insertProjectBranch(PROJECT, branch).setCreatedAt(createdAt); } dbTester.commit(); - when(projectHolder.projectDto()).thenReturn(dbTester.components().getProjectDto(projectDto)); + when(projectHolder.projectDto()).thenReturn(dbTester.components().getProjectDtoByMainBranch(projectDto)); } @Test diff --git a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectexport/component/ExportComponentsStepIT.java b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectexport/component/ExportComponentsStepIT.java index 7c33c052ae1..67a2285b2f5 100644 --- a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectexport/component/ExportComponentsStepIT.java +++ b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectexport/component/ExportComponentsStepIT.java @@ -99,10 +99,10 @@ public class ExportComponentsStepIT { @Test public void export_components_including_project() { - dbTester.components().insertPublicProject(PROJECT); + dbTester.components().insertPublicProject(PROJECT).getMainBranchComponent(); dbTester.getDbClient().componentDao().insert(dbTester.getSession(), FILE, true); dbTester.commit(); - when(projectHolder.projectDto()).thenReturn(dbTester.components().getProjectDto(PROJECT)); + when(projectHolder.projectDto()).thenReturn(dbTester.components().getProjectDtoByMainBranch(PROJECT)); underTest.execute(new TestComputationStepContext()); @@ -116,10 +116,10 @@ public class ExportComponentsStepIT { @Test public void execute_register_all_components_uuids_as_their_id_in_ComponentRepository() { - dbTester.components().insertPublicProject(PROJECT); + dbTester.components().insertPublicProject(PROJECT).getMainBranchComponent(); dbTester.getDbClient().componentDao().insert(dbTester.getSession(), FILE, true); dbTester.commit(); - when(projectHolder.projectDto()).thenReturn(dbTester.components().getProjectDto(PROJECT)); + when(projectHolder.projectDto()).thenReturn(dbTester.components().getProjectDtoByMainBranch(PROJECT)); underTest.execute(new TestComputationStepContext()); @@ -130,10 +130,10 @@ public class ExportComponentsStepIT { @Test public void throws_ISE_if_error() { - dbTester.components().insertPublicProject(PROJECT); + dbTester.components().insertPublicProject(PROJECT).getMainBranchComponent(); dbTester.getDbClient().componentDao().insert(dbTester.getSession(), FILE, true); dbTester.commit(); - when(projectHolder.projectDto()).thenReturn(dbTester.components().getProjectDto(PROJECT)); + when(projectHolder.projectDto()).thenReturn(dbTester.components().getProjectDtoByMainBranch(PROJECT)); dumpWriter.failIfMoreThan(1, DumpElement.COMPONENTS); assertThatThrownBy(() -> underTest.execute(new TestComputationStepContext())) diff --git a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectexport/issue/ExportIssuesChangelogStepIT.java b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectexport/issue/ExportIssuesChangelogStepIT.java index d316d5aadc6..4a672629829 100644 --- a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectexport/issue/ExportIssuesChangelogStepIT.java +++ b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectexport/issue/ExportIssuesChangelogStepIT.java @@ -78,8 +78,8 @@ public class ExportIssuesChangelogStepIT { @Before public void setUp() { logTester.setLevel(Level.DEBUG); - ComponentDto projectDto = dbTester.components().insertPublicProject(p -> p.setUuid(PROJECT_UUID)); - when(projectHolder.projectDto()).thenReturn(dbTester.components().getProjectDto(projectDto)); + ComponentDto projectDto = dbTester.components().insertPublicProject(p -> p.setUuid(PROJECT_UUID)).getMainBranchComponent(); + when(projectHolder.projectDto()).thenReturn(dbTester.components().getProjectDtoByMainBranch(projectDto)); when(projectHolder.branches()).thenReturn(newArrayList( new BranchDto().setBranchType(BranchType.BRANCH).setKey("master").setProjectUuid(PROJECT_UUID).setUuid(PROJECT_UUID))); diff --git a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectexport/issue/ExportIssuesStepIT.java b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectexport/issue/ExportIssuesStepIT.java index ae29778c205..014ad779980 100644 --- a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectexport/issue/ExportIssuesStepIT.java +++ b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectexport/issue/ExportIssuesStepIT.java @@ -377,9 +377,9 @@ public class ExportIssuesStepIT { } private ProjectDto createProject() { - ComponentDto projectDto = dbTester.components().insertPrivateProject(c -> c.setKey(PROJECT_KEY).setUuid(SOME_PROJECT_UUID)); + ComponentDto projectDto = dbTester.components().insertPrivateProject(c -> c.setKey(PROJECT_KEY).setUuid(SOME_PROJECT_UUID)).getMainBranchComponent(); dbTester.commit(); - return dbTester.components().getProjectDto(projectDto); + return dbTester.components().getProjectDtoByMainBranch(projectDto); } private IssueDto createBaseIssueDto(RuleDto ruleDto, String componentUuid) { diff --git a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectexport/rule/ExportAdHocRulesStepIT.java b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectexport/rule/ExportAdHocRulesStepIT.java index afc77a8336c..d68b74e7cc5 100644 --- a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectexport/rule/ExportAdHocRulesStepIT.java +++ b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectexport/rule/ExportAdHocRulesStepIT.java @@ -177,10 +177,10 @@ public class ExportAdHocRulesStepIT { private ProjectDto createProject() { Date createdAt = new Date(); - ComponentDto projectDto = dbTester.components().insertPublicProject(PROJECT); + ComponentDto projectDto = dbTester.components().insertPublicProject(PROJECT).getMainBranchComponent(); BRANCHES.forEach(branch -> dbTester.components().insertProjectBranch(projectDto, branch).setCreatedAt(createdAt)); dbTester.commit(); - return dbTester.components().getProjectDto(projectDto); + return dbTester.components().getProjectDtoByMainBranch(projectDto); } private void insertIssue(RuleDto ruleDto, String projectUuid, String componentUuid) { diff --git a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectexport/steps/ExportEventsStepIT.java b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectexport/steps/ExportEventsStepIT.java index aa5e7a8debb..84edae825c0 100644 --- a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectexport/steps/ExportEventsStepIT.java +++ b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectexport/steps/ExportEventsStepIT.java @@ -71,9 +71,9 @@ public class ExportEventsStepIT { @Before public void setUp() { logTester.setLevel(Level.DEBUG); - ComponentDto projectDto = dbTester.components().insertPublicProject(PROJECT); + ComponentDto projectDto = dbTester.components().insertPublicProject(PROJECT).getMainBranchComponent(); componentRepository.register(1, projectDto.uuid(), false); - projectHolder.setProjectDto(dbTester.components().getProjectDto(projectDto)); + projectHolder.setProjectDto(dbTester.components().getProjectDtoByMainBranch(projectDto)); } @Test diff --git a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectexport/steps/ExportLinksStepIT.java b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectexport/steps/ExportLinksStepIT.java index 1fab9897443..c4ce226b002 100644 --- a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectexport/steps/ExportLinksStepIT.java +++ b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectexport/steps/ExportLinksStepIT.java @@ -72,8 +72,8 @@ public class ExportLinksStepIT { @Before public void setUp() { logTester.setLevel(Level.DEBUG); - ComponentDto project = db.components().insertPublicProject(PROJECT); - when(projectHolder.projectDto()).thenReturn(db.components().getProjectDto(project)); + ComponentDto project = db.components().insertPublicProject(PROJECT).getMainBranchComponent(); + when(projectHolder.projectDto()).thenReturn(db.components().getProjectDtoByMainBranch(project)); when(componentRepository.getRef(PROJECT_UUID)).thenReturn(1L); } @@ -89,7 +89,7 @@ public class ExportLinksStepIT { public void export_links() { ProjectLinkDto link1 = db.componentLinks().insertCustomLink(PROJECT); ProjectLinkDto link2 = db.componentLinks().insertProvidedLink(PROJECT); - db.componentLinks().insertCustomLink(db.components().insertPrivateProject()); + db.componentLinks().insertCustomLink(db.components().insertPrivateProject().getMainBranchComponent()); underTest.execute(new TestComputationStepContext()); @@ -106,7 +106,7 @@ public class ExportLinksStepIT { db.componentLinks().insertCustomLink(PROJECT); db.componentLinks().insertProvidedLink(PROJECT); db.componentLinks().insertProvidedLink(PROJECT); - db.componentLinks().insertCustomLink(db.components().insertPrivateProject()); + db.componentLinks().insertCustomLink(db.components().insertPrivateProject().getMainBranchComponent()); dumpWriter.failIfMoreThan(2, DumpElement.LINKS); diff --git a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectexport/steps/ExportLiveMeasuresStepIT.java b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectexport/steps/ExportLiveMeasuresStepIT.java index 644e8eff578..9739cf0d182 100644 --- a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectexport/steps/ExportLiveMeasuresStepIT.java +++ b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectexport/steps/ExportLiveMeasuresStepIT.java @@ -78,7 +78,7 @@ public class ExportLiveMeasuresStepIT { componentRepository.register(1, project.uuid(), false); MetricDto metric = dbTester.measures().insertMetric(m -> m.setKey("metric1").setValueType(INT.name())); dbTester.measures().insertLiveMeasure(project, metric, m -> m.setValue(4711.0d)); - when(projectHolder.projectDto()).thenReturn(dbTester.components().getProjectDto(project)); + when(projectHolder.projectDto()).thenReturn(dbTester.components().getProjectDtoByMainBranch(project)); when(projectHolder.branches()).thenReturn(newArrayList(new BranchDto() .setProjectUuid(project.uuid()) .setUuid(project.uuid()) @@ -101,7 +101,7 @@ public class ExportLiveMeasuresStepIT { componentRepository.register(1, project.uuid(), false); MetricDto metric = dbTester.measures().insertMetric(m -> m.setValueType(INT.name())); dbTester.measures().insertLiveMeasure(project, metric, m -> m.setValue(4711.0d)); - when(projectHolder.projectDto()).thenReturn(dbTester.components().getProjectDto(project)); + when(projectHolder.projectDto()).thenReturn(dbTester.components().getProjectDtoByMainBranch(project)); when(projectHolder.branches()).thenReturn(newArrayList(new BranchDto() .setProjectUuid(project.uuid()) .setUuid(project.uuid()) @@ -120,7 +120,7 @@ public class ExportLiveMeasuresStepIT { componentRepository.register(1, project.uuid(), false); MetricDto metric = dbTester.measures().insertMetric(m -> m.setValueType(INT.name()).setEnabled(false)); dbTester.measures().insertLiveMeasure(project, metric, m -> m.setValue(4711.0d)); - when(projectHolder.projectDto()).thenReturn(dbTester.components().getProjectDto(project)); + when(projectHolder.projectDto()).thenReturn(dbTester.components().getProjectDtoByMainBranch(project)); when(projectHolder.branches()).thenReturn(newArrayList(new BranchDto() .setProjectUuid(project.uuid()) .setUuid(project.uuid()) @@ -139,7 +139,7 @@ public class ExportLiveMeasuresStepIT { componentRepository.register(1, project.uuid(), false); MetricDto metric = dbTester.measures().insertMetric(m -> m.setKey("new_metric").setValueType(INT.name())); dbTester.measures().insertLiveMeasure(project, metric, m -> m.setProjectUuid(project.uuid()).setValue(7.0d).setData("test")); - when(projectHolder.projectDto()).thenReturn(dbTester.components().getProjectDto(project)); + when(projectHolder.projectDto()).thenReturn(dbTester.components().getProjectDtoByMainBranch(project)); when(projectHolder.branches()).thenReturn(newArrayList(new BranchDto() .setProjectUuid(project.uuid()) .setUuid(project.uuid()) @@ -173,7 +173,7 @@ public class ExportLiveMeasuresStepIT { componentRepository.register(1, project.uuid(), false); MetricDto metric = dbTester.measures().insertMetric(m -> m.setValueType(INT.name())); dbTester.measures().insertLiveMeasure(project, metric, m -> m.setProjectUuid(project.uuid()).setValue(null).setData((String) null)); - when(projectHolder.projectDto()).thenReturn(dbTester.components().getProjectDto(project)); + when(projectHolder.projectDto()).thenReturn(dbTester.components().getProjectDtoByMainBranch(project)); when(projectHolder.branches()).thenReturn(newArrayList(new BranchDto() .setProjectUuid(project.uuid()) .setUuid(project.uuid()) @@ -203,6 +203,6 @@ public class ExportLiveMeasuresStepIT { } private ComponentDto createProject(boolean enabled) { - return dbTester.components().insertPrivateProject(p -> p.setEnabled(enabled)); + return dbTester.components().insertPrivateProject(p -> p.setEnabled(enabled)).getMainBranchComponent(); } } diff --git a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectexport/steps/ExportMeasuresStepIT.java b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectexport/steps/ExportMeasuresStepIT.java index c9eca291c93..6bc708f93b3 100644 --- a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectexport/steps/ExportMeasuresStepIT.java +++ b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectexport/steps/ExportMeasuresStepIT.java @@ -108,12 +108,12 @@ public class ExportMeasuresStepIT { @Before public void setUp() { logTester.setLevel(Level.DEBUG); - String projectUuid = dbTester.components().insertPublicProject(PROJECT).uuid(); + String projectUuid = dbTester.components().insertPublicProject(PROJECT).getMainBranchComponent().uuid(); componentRepository.register(1, projectUuid, false); dbTester.getDbClient().componentDao().insert(dbTester.getSession(), List.of(FILE, ANOTHER_PROJECT), true); dbTester.getDbClient().metricDao().insert(dbTester.getSession(), NCLOC, DISABLED_METRIC, NEW_NCLOC); dbTester.commit(); - when(projectHolder.projectDto()).thenReturn(dbTester.components().getProjectDto(PROJECT)); + when(projectHolder.projectDto()).thenReturn(dbTester.components().getProjectDtoByMainBranch(PROJECT)); when(projectHolder.branches()).thenReturn(BRANCHES); } diff --git a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectexport/steps/ExportNewCodePeriodsStepIT.java b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectexport/steps/ExportNewCodePeriodsStepIT.java index 8ef1e54a009..8a61f02a780 100644 --- a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectexport/steps/ExportNewCodePeriodsStepIT.java +++ b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectexport/steps/ExportNewCodePeriodsStepIT.java @@ -89,14 +89,14 @@ public class ExportNewCodePeriodsStepIT { public void setUp() { logTester.setLevel(Level.DEBUG); Date createdAt = new Date(); - ComponentDto projectDto = dbTester.components().insertPublicProject(PROJECT); + ComponentDto projectDto = dbTester.components().insertPublicProject(PROJECT).getMainBranchComponent(); PROJECT_BRANCHES.forEach(branch -> dbTester.components().insertProjectBranch(projectDto, branch).setCreatedAt(createdAt)); - ComponentDto anotherProjectDto = dbTester.components().insertPublicProject(ANOTHER_PROJECT); + ComponentDto anotherProjectDto = dbTester.components().insertPublicProject(ANOTHER_PROJECT).getMainBranchComponent(); ANOTHER_PROJECT_BRANCHES.forEach(branch -> dbTester.components().insertProjectBranch(anotherProjectDto, branch).setCreatedAt(createdAt)); dbTester.commit(); - projectHolder.setProjectDto(dbTester.components().getProjectDto(PROJECT)); + projectHolder.setProjectDto(dbTester.components().getProjectDtoByMainBranch(PROJECT)); } @Test diff --git a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectexport/steps/ExportSettingsStepIT.java b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectexport/steps/ExportSettingsStepIT.java index 4cd506d9ac2..777d52bd98a 100644 --- a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectexport/steps/ExportSettingsStepIT.java +++ b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectexport/steps/ExportSettingsStepIT.java @@ -67,10 +67,10 @@ public class ExportSettingsStepIT { @Before public void setUp() { logTester.setLevel(Level.DEBUG); - dbTester.components().insertPublicProject(PROJECT); - dbTester.components().insertPublicProject(ANOTHER_PROJECT); + dbTester.components().insertPublicProject(PROJECT).getMainBranchComponent(); + dbTester.components().insertPublicProject(ANOTHER_PROJECT).getMainBranchComponent(); dbTester.commit(); - projectHolder.setProjectDto(dbTester.components().getProjectDto(PROJECT)); + projectHolder.setProjectDto(dbTester.components().getProjectDtoByMainBranch(PROJECT)); componentRepository.register(1, PROJECT.uuid(), false); } diff --git a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectexport/steps/LoadProjectStepIT.java b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectexport/steps/LoadProjectStepIT.java index 2f9475a1e31..29e1180b6fc 100644 --- a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectexport/steps/LoadProjectStepIT.java +++ b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectexport/steps/LoadProjectStepIT.java @@ -68,7 +68,7 @@ public class LoadProjectStepIT { @Test public void registers_project_if_valid() { - ComponentDto project = dbTester.components().insertPublicProject(c -> c.setKey(PROJECT_KEY)); + ComponentDto project = dbTester.components().insertPublicProject(c -> c.setKey(PROJECT_KEY)).getMainBranchComponent(); underTest.execute(new TestComputationStepContext()); assertThat(definitionHolder.projectDto().getKey()).isEqualTo(project.getKey()); } diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/analysis/ProjectConfigurationFactoryTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/analysis/ProjectConfigurationFactoryTest.java index 1e2cf003430..2f6df7a0bdd 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/analysis/ProjectConfigurationFactoryTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/analysis/ProjectConfigurationFactoryTest.java @@ -23,7 +23,6 @@ import org.junit.Rule; import org.junit.Test; import org.sonar.api.config.Configuration; import org.sonar.api.config.internal.MapSettings; -import org.sonar.ce.task.projectanalysis.component.DefaultBranchImpl; import org.sonar.db.DbTester; import org.sonar.db.component.ComponentDto; @@ -47,7 +46,7 @@ public class ProjectConfigurationFactoryTest { @Test public void return_project_settings() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); db.properties().insertProperties(null, project.getKey(), project.name(), project.qualifier(), newComponentPropertyDto(project).setKey("1").setValue("val1"), newComponentPropertyDto(project).setKey("2").setValue("val2"), @@ -63,7 +62,7 @@ public class ProjectConfigurationFactoryTest { @Test public void project_settings_override_global_settings() { settings.setProperty("key", "value"); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); db.properties().insertProperties(null, project.getKey(), project.name(), project.qualifier(), newComponentPropertyDto(project).setKey("key").setValue("value2")); diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/PullRequestSourceBranchMergerTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/PullRequestSourceBranchMergerTest.java index f6a5d6dfdf2..76da837df48 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/PullRequestSourceBranchMergerTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/PullRequestSourceBranchMergerTest.java @@ -88,7 +88,7 @@ public class PullRequestSourceBranchMergerTest { issueLifecycle, sourceBranchInputFactory); - ComponentDto projectDto = db.components().insertPublicProject(p -> p.setKey(PROJECT_KEY).setUuid(PROJECT_UUID)); + ComponentDto projectDto = db.components().insertPublicProject(p -> p.setKey(PROJECT_KEY).setUuid(PROJECT_UUID)).getMainBranchComponent(); ComponentDto branch1Dto = db.components().insertProjectBranch(projectDto, b -> b.setKey("myBranch1") .setBranchType(BranchType.PULL_REQUEST) .setMergeBranchUuid(projectDto.uuid())); diff --git a/server/sonar-ce/src/it/java/org/sonar/ce/notification/ReportAnalysisFailureNotificationExecutionListenerIT.java b/server/sonar-ce/src/it/java/org/sonar/ce/notification/ReportAnalysisFailureNotificationExecutionListenerIT.java index 97d228c73b7..75c8812f05c 100644 --- a/server/sonar-ce/src/it/java/org/sonar/ce/notification/ReportAnalysisFailureNotificationExecutionListenerIT.java +++ b/server/sonar-ce/src/it/java/org/sonar/ce/notification/ReportAnalysisFailureNotificationExecutionListenerIT.java @@ -159,7 +159,7 @@ public class ReportAnalysisFailureNotificationExecutionListenerIT { @Test public void onEnd_fails_with_IAE_if_component_is_not_a_project() { when(ceTaskMock.getType()).thenReturn(CeTaskTypes.REPORT); - ComponentDto project = dbTester.components().insertPrivateProject(); + ComponentDto project = dbTester.components().insertPrivateProject().getMainBranchComponent(); ComponentDto directory = dbTester.components().insertComponent(newDirectory(project, randomAlphanumeric(12))); ComponentDto file = dbTester.components().insertComponent(ComponentTesting.newFileDto(project)); ComponentDto view = dbTester.components().insertComponent(ComponentTesting.newPortfolio()); @@ -196,7 +196,7 @@ public class ReportAnalysisFailureNotificationExecutionListenerIT { when(ceTaskMock.getComponent()).thenReturn(Optional.of(new CeTask.Component(componentUuid, null, null))); when(notificationService.hasProjectSubscribersForTypes(componentUuid, singleton(ReportAnalysisFailureNotification.class))) .thenReturn(true); - dbTester.components().insertPrivateProject(s -> s.setUuid(componentUuid)); + dbTester.components().insertPrivateProject(s -> s.setUuid(componentUuid)).getMainBranchComponent(); Duration randomDuration = randomDuration(); assertThatThrownBy(() -> underTest.onEnd(ceTaskMock, CeActivityDto.Status.FAILED, randomDuration, ceTaskResultMock, throwableMock)) @@ -304,7 +304,7 @@ public class ReportAnalysisFailureNotificationExecutionListenerIT { } private ComponentDto initMocksToPassConditions(String taskUuid, int createdAt, @Nullable Long executedAt) { - ComponentDto project = random.nextBoolean() ? dbTester.components().insertPrivateProject() : dbTester.components().insertPublicProject(); + ComponentDto project = random.nextBoolean() ? dbTester.components().insertPrivateProject().getMainBranchComponent() : dbTester.components().insertPublicProject().getMainBranchComponent(); when(ceTaskMock.getType()).thenReturn(CeTaskTypes.REPORT); when(ceTaskMock.getComponent()).thenReturn(Optional.of(new CeTask.Component(project.uuid(), null, null))); when(ceTaskMock.getUuid()).thenReturn(taskUuid); diff --git a/server/sonar-ce/src/it/java/org/sonar/ce/queue/InternalCeQueueImplIT.java b/server/sonar-ce/src/it/java/org/sonar/ce/queue/InternalCeQueueImplIT.java index 01d31b78804..5fee41a2903 100644 --- a/server/sonar-ce/src/it/java/org/sonar/ce/queue/InternalCeQueueImplIT.java +++ b/server/sonar-ce/src/it/java/org/sonar/ce/queue/InternalCeQueueImplIT.java @@ -385,7 +385,7 @@ public class InternalCeQueueImplIT { @Test public void peek_populates_name_and_key_for_existing_component_and_main_component() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto branch = db.components().insertProjectBranch(project); CeTask task = submit(CeTaskTypes.REPORT, project, branch); diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/alm/setting/ProjectAlmSettingDaoIT.java b/server/sonar-db-dao/src/it/java/org/sonar/db/alm/setting/ProjectAlmSettingDaoIT.java index f50f77d8496..b65cf1203a2 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/alm/setting/ProjectAlmSettingDaoIT.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/alm/setting/ProjectAlmSettingDaoIT.java @@ -55,8 +55,8 @@ public class ProjectAlmSettingDaoIT { public void select_by_project() { when(uuidFactory.create()).thenReturn(A_UUID); AlmSettingDto githubAlmSettingDto = db.almSettings().insertGitHubAlmSetting(); - ProjectDto project = db.components().insertPrivateProjectDto(); - ProjectDto anotherProject = db.components().insertPrivateProjectDto(); + ProjectDto project = db.components().insertPrivateProject().getProjectDto(); + ProjectDto anotherProject = db.components().insertPrivateProject().getProjectDto(); ProjectAlmSettingDto githubProjectAlmSettingDto = newGithubProjectAlmSettingDto(githubAlmSettingDto, project); underTest.insertOrUpdate(dbSession, githubProjectAlmSettingDto, githubAlmSettingDto.getKey(), anotherProject.getName(), anotherProject.getKey()); @@ -77,11 +77,11 @@ public class ProjectAlmSettingDaoIT { public void select_by_alm_setting_and_slugs() { when(uuidFactory.create()).thenReturn(A_UUID); AlmSettingDto almSettingsDto = db.almSettings().insertBitbucketAlmSetting(); - ProjectDto project = db.components().insertPrivateProjectDto(); + ProjectDto project = db.components().insertPrivateProject().getProjectDto(); ProjectAlmSettingDto bitbucketProjectAlmSettingDto = newBitbucketProjectAlmSettingDto(almSettingsDto, project); bitbucketProjectAlmSettingDto.setAlmSlug("slug1"); underTest.insertOrUpdate(dbSession, bitbucketProjectAlmSettingDto, almSettingsDto.getKey(), project.getName(), project.getKey()); - ProjectAlmSettingDto bitbucketProjectAlmSettingDto2 = newBitbucketProjectAlmSettingDto(almSettingsDto, db.components().insertPrivateProjectDto()); + ProjectAlmSettingDto bitbucketProjectAlmSettingDto2 = newBitbucketProjectAlmSettingDto(almSettingsDto, db.components().insertPrivateProject().getProjectDto()); bitbucketProjectAlmSettingDto2.setAlmSlug("slug2"); when(uuidFactory.create()).thenReturn(A_UUID + 1); underTest.insertOrUpdate(dbSession, bitbucketProjectAlmSettingDto2, almSettingsDto.getKey(), project.getName(), project.getKey()); @@ -105,11 +105,11 @@ public class ProjectAlmSettingDaoIT { public void select_by_alm_setting_and_repos() { when(uuidFactory.create()).thenReturn(A_UUID); AlmSettingDto almSettingsDto = db.almSettings().insertGitHubAlmSetting(); - ProjectDto project = db.components().insertPrivateProjectDto(); + ProjectDto project = db.components().insertPrivateProject().getProjectDto(); ProjectAlmSettingDto githubProjectAlmSettingDto = newGithubProjectAlmSettingDto(almSettingsDto, project); githubProjectAlmSettingDto.setAlmRepo("repo1"); underTest.insertOrUpdate(dbSession, githubProjectAlmSettingDto, almSettingsDto.getKey(), project.getName(), project.getKey()); - ProjectAlmSettingDto githubProjectAlmSettingDto2 = newGithubProjectAlmSettingDto(almSettingsDto, db.components().insertPrivateProjectDto()); + ProjectAlmSettingDto githubProjectAlmSettingDto2 = newGithubProjectAlmSettingDto(almSettingsDto, db.components().insertPrivateProject().getProjectDto()); githubProjectAlmSettingDto2.setAlmRepo("repo2"); when(uuidFactory.create()).thenReturn(A_UUID + 1); underTest.insertOrUpdate(dbSession, githubProjectAlmSettingDto2, almSettingsDto.getKey(), project.getName(), project.getKey()); @@ -133,7 +133,7 @@ public class ProjectAlmSettingDaoIT { public void select_alm_type_and_url_by_project() { when(uuidFactory.create()).thenReturn(A_UUID); AlmSettingDto almSettingsDto = db.almSettings().insertGitHubAlmSetting(); - ProjectDto project = db.components().insertPrivateProjectDto(); + ProjectDto project = db.components().insertPrivateProject().getProjectDto(); ProjectAlmSettingDto githubProjectAlmSettingDto = newGithubProjectAlmSettingDto(almSettingsDto, project); underTest.insertOrUpdate(dbSession, githubProjectAlmSettingDto, almSettingsDto.getKey(), project.getName(), project.getKey()); assertThat(underTest.selectAlmTypeAndUrlByProject(dbSession)) @@ -145,7 +145,7 @@ public class ProjectAlmSettingDaoIT { public void update_existing_binding() { when(uuidFactory.create()).thenReturn(A_UUID); AlmSettingDto githubAlmSetting = db.almSettings().insertGitHubAlmSetting(); - ProjectDto project = db.components().insertPrivateProjectDto(); + ProjectDto project = db.components().insertPrivateProject().getProjectDto(); ProjectAlmSettingDto projectAlmSettingDto = db.almSettings().insertGitHubProjectAlmSetting(githubAlmSetting, project); AlmSettingDto anotherGithubAlmSetting = db.almSettings().insertGitHubAlmSetting(); @@ -168,9 +168,9 @@ public class ProjectAlmSettingDaoIT { public void deleteByProject() { when(uuidFactory.create()).thenReturn(A_UUID); AlmSettingDto githubAlmSetting = db.almSettings().insertGitHubAlmSetting(); - ProjectDto project = db.components().insertPrivateProjectDto(); + ProjectDto project = db.components().insertPrivateProject().getProjectDto(); db.almSettings().insertGitHubProjectAlmSetting(githubAlmSetting, project); - ProjectDto anotherProject = db.components().insertPrivateProjectDto(); + ProjectDto anotherProject = db.components().insertPrivateProject().getProjectDto(); db.almSettings().insertGitHubProjectAlmSetting(githubAlmSetting, anotherProject); underTest.deleteByProject(dbSession, project); @@ -183,13 +183,13 @@ public class ProjectAlmSettingDaoIT { public void deleteByAlmSetting() { when(uuidFactory.create()).thenReturn(A_UUID); AlmSettingDto githubAlmSetting = db.almSettings().insertGitHubAlmSetting(); - ProjectDto project1 = db.components().insertPrivateProjectDto(); - ProjectDto project2 = db.components().insertPrivateProjectDto(); + ProjectDto project1 = db.components().insertPrivateProject().getProjectDto(); + ProjectDto project2 = db.components().insertPrivateProject().getProjectDto(); db.almSettings().insertGitHubProjectAlmSetting(githubAlmSetting, project1); db.almSettings().insertGitHubProjectAlmSetting(githubAlmSetting, project2); AlmSettingDto githubAlmSetting1 = db.almSettings().insertGitHubAlmSetting(); - ProjectDto anotherProject = db.components().insertPrivateProjectDto(); + ProjectDto anotherProject = db.components().insertPrivateProject().getProjectDto(); db.almSettings().insertGitHubProjectAlmSetting(githubAlmSetting1, anotherProject); underTest.deleteByAlmSetting(dbSession, githubAlmSetting); diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/alm/setting/ProjectAlmSettingDaoWithPersisterIT.java b/server/sonar-db-dao/src/it/java/org/sonar/db/alm/setting/ProjectAlmSettingDaoWithPersisterIT.java index 69fc9d22d52..01c6cc9958f 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/alm/setting/ProjectAlmSettingDaoWithPersisterIT.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/alm/setting/ProjectAlmSettingDaoWithPersisterIT.java @@ -58,7 +58,7 @@ public class ProjectAlmSettingDaoWithPersisterIT { @Test public void insertAndUpdateExistingBindingArePersisted() { AlmSettingDto githubAlmSetting = newGithubAlmSettingDto().setUuid(uuidFactory.create()); - ProjectDto project = db.components().insertPrivateProjectDto(); + ProjectDto project = db.components().insertPrivateProject().getProjectDto(); ProjectAlmSettingDto projectAlmSettingDto = newGithubProjectAlmSettingDto(githubAlmSetting, project) .setSummaryCommentEnabled(false); underTest.insertOrUpdate(dbSession, projectAlmSettingDto, githubAlmSetting.getKey(), project.getName(), project.getKey()); @@ -94,7 +94,7 @@ public class ProjectAlmSettingDaoWithPersisterIT { @Test public void deleteByProjectIsPersisted() { AlmSettingDto githubAlmSetting = newGithubAlmSettingDto().setUuid(uuidFactory.create()); - ProjectDto project = db.components().insertPrivateProjectDto(); + ProjectDto project = db.components().insertPrivateProject().getProjectDto(); ProjectAlmSettingDto projectAlmSettingDto = newGithubProjectAlmSettingDto(githubAlmSetting, project) .setSummaryCommentEnabled(false); underTest.insertOrUpdate(dbSession, projectAlmSettingDto, githubAlmSetting.getKey(), project.getName(), project.getKey()); @@ -111,7 +111,7 @@ public class ProjectAlmSettingDaoWithPersisterIT { @Test public void deleteByWithoutAffectedRowsProjectIsNotPersisted() { - ProjectDto project = db.components().insertPrivateProjectDto(); + ProjectDto project = db.components().insertPrivateProject().getProjectDto(); underTest.deleteByProject(dbSession, project); diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/ce/CeActivityDaoIT.java b/server/sonar-db-dao/src/it/java/org/sonar/db/ce/CeActivityDaoIT.java index 5f0876668ce..eb05863189f 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/ce/CeActivityDaoIT.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/ce/CeActivityDaoIT.java @@ -780,22 +780,22 @@ public class CeActivityDaoIT { insert("TASK_1", REPORT, MAINCOMPONENT_1, SUCCESS); insert("TASK_2", REPORT, MAINCOMPONENT_1, FAILED); - ProjectDto projectDto1 = db.components().insertPrivateProjectDto( + ProjectDto projectDto1 = db.components().insertPrivateProject( branchDto -> branchDto.setNeedIssueSync(false), c -> { }, p -> { - }); + }).getProjectDto(); insert("TASK_3", CeTaskTypes.BRANCH_ISSUE_SYNC, projectDto1.getUuid(), projectDto1.getUuid(), SUCCESS); - ProjectDto projectDto2 = db.components().insertPrivateProjectDto(branchDto -> branchDto.setNeedIssueSync(false), c -> { + ProjectDto projectDto2 = db.components().insertPrivateProject(branchDto -> branchDto.setNeedIssueSync(false), c -> { }, p -> { - }); + }).getProjectDto(); insert("TASK_4", CeTaskTypes.BRANCH_ISSUE_SYNC, projectDto2.getUuid(), projectDto2.getUuid(), SUCCESS); assertThat(underTest.hasAnyFailedOrCancelledIssueSyncTask(db.getSession())).isFalse(); - ProjectDto projectDto3 = db.components().insertPrivateProjectDto(branchDto -> branchDto.setNeedIssueSync(false), c -> { + ProjectDto projectDto3 = db.components().insertPrivateProject(branchDto -> branchDto.setNeedIssueSync(false), c -> { }, p -> { - }); + }).getProjectDto(); insert("TASK_5", CeTaskTypes.BRANCH_ISSUE_SYNC, projectDto3.getUuid(), projectDto3.getUuid(), SUCCESS); BranchDto projectBranch1 = db.components() diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/ce/CeTaskMessageDaoIT.java b/server/sonar-db-dao/src/it/java/org/sonar/db/ce/CeTaskMessageDaoIT.java index 16ba965c87e..a6d00359b2d 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/ce/CeTaskMessageDaoIT.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/ce/CeTaskMessageDaoIT.java @@ -139,7 +139,7 @@ public class CeTaskMessageDaoIT { @Test public void selectNonDismissedByUserAndTask_returns_non_dismissed_messages() { UserDto user = dbTester.users().insertUser(); - ProjectDto project = dbTester.components().insertPrivateProjectDto(); + ProjectDto project = dbTester.components().insertPrivateProject().getProjectDto(); dbTester.users().insertUserDismissedMessage(user, project, CeTaskMessageType.SUGGEST_DEVELOPER_EDITION_UPGRADE); String taskUuid = "17ae66e6-fe83-4c80-b704-4b04e9c5abe8"; CeTaskMessageDto msg1 = insertMessage(taskUuid, 1, 1_222_333L); diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/component/AnalysisPropertiesDaoIT.java b/server/sonar-db-dao/src/it/java/org/sonar/db/component/AnalysisPropertiesDaoIT.java index 22b98b1ea6a..3da4110a630 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/component/AnalysisPropertiesDaoIT.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/component/AnalysisPropertiesDaoIT.java @@ -182,7 +182,7 @@ public class AnalysisPropertiesDaoIT { final String analysisPropertyKey = "key"; for (int i = 0; i < 7; i++) { String uuid = "uuid" + i; - ProjectDto project = dbTester.components().insertPrivateProjectDto(p -> p.setUuid(uuid).setBranchUuid(uuid)); + ProjectDto project = dbTester.components().insertPrivateProject(p -> p.setUuid(uuid).setBranchUuid(uuid)).getProjectDto(); dbTester.components().insertSnapshot(project, s -> s.setLast(true).setUuid(uuid)); // branches shouldn't be taken into account dbTester.components().insertProjectBranch(project); diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/component/ApplicationProjectsDaoIT.java b/server/sonar-db-dao/src/it/java/org/sonar/db/component/ApplicationProjectsDaoIT.java index b9b86dad881..37a91d41a48 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/component/ApplicationProjectsDaoIT.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/component/ApplicationProjectsDaoIT.java @@ -79,9 +79,9 @@ public class ApplicationProjectsDaoIT { @Test public void select_project_branches_from_application_branch() { - var project = db.components().insertPublicProjectDto(p -> p.setKey("project")); + var project = db.components().insertPublicProject(p -> p.setKey("project")).getProjectDto(); var projectBranch = db.components().insertProjectBranch(project, b -> b.setKey("project-branch")); - var app = db.components().insertPrivateApplicationDto(a -> a.setKey("app1")); + var app = db.components().insertPrivateApplication(a -> a.setKey("app1")).getProjectDto(); var appBranch = db.components().insertProjectBranch(app, b -> b.setKey("app-branch")); db.components().addApplicationProject(app, project); underTest.addProjectBranchToAppBranch(dbSession, app.getUuid(), appBranch.getUuid(), project.getUuid(), projectBranch.getUuid()); diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/component/BranchDaoIT.java b/server/sonar-db-dao/src/it/java/org/sonar/db/component/BranchDaoIT.java index b5e3ded970a..270a3e6a1ba 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/component/BranchDaoIT.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/component/BranchDaoIT.java @@ -411,9 +411,9 @@ public class BranchDaoIT { @Test public void selectByBranchKeys() { - ProjectDto project1 = db.components().insertPrivateProjectDto(); - ProjectDto project2 = db.components().insertPrivateProjectDto(); - ProjectDto project3 = db.components().insertPrivateProjectDto(); + ProjectDto project1 = db.components().insertPrivateProject().getProjectDto(); + ProjectDto project2 = db.components().insertPrivateProject().getProjectDto(); + ProjectDto project3 = db.components().insertPrivateProject().getProjectDto(); BranchDto branch1 = db.components().insertProjectBranch(project1, b -> b.setKey("branch1")); BranchDto branch2 = db.components().insertProjectBranch(project2, b -> b.setKey("branch2")); @@ -532,7 +532,7 @@ public class BranchDaoIT { @Test public void selectByUuids() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto branch1 = db.components().insertProjectBranch(project); ComponentDto branch2 = db.components().insertProjectBranch(project); ComponentDto branch3 = db.components().insertProjectBranch(project); @@ -548,8 +548,8 @@ public class BranchDaoIT { @Test public void selectByProjectUuid() { - ComponentDto project1 = db.components().insertPrivateProject(); - ComponentDto project2 = db.components().insertPrivateProject(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto branch1 = db.components().insertProjectBranch(project1); ComponentDto branch2 = db.components().insertProjectBranch(project1); @@ -566,7 +566,7 @@ public class BranchDaoIT { @Test public void selectByUuid() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto branch1 = db.components().insertProjectBranch(project); ComponentDto branch2 = db.components().insertProjectBranch(project); @@ -579,17 +579,17 @@ public class BranchDaoIT { @Test public void countPrAndBranchByProjectUuid() { - ComponentDto project1 = db.components().insertPrivateProject(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); db.components().insertProjectBranch(project1, b -> b.setBranchType(BRANCH).setKey("p1-branch-1")); db.components().insertProjectBranch(project1, b -> b.setBranchType(BRANCH).setKey("p1-branch-2")); db.components().insertProjectBranch(project1, b -> b.setBranchType(PULL_REQUEST).setKey("p1-pr-1")); db.components().insertProjectBranch(project1, b -> b.setBranchType(PULL_REQUEST).setKey("p1-pr-2")); db.components().insertProjectBranch(project1, b -> b.setBranchType(PULL_REQUEST).setKey("p1-pr-3")); - ComponentDto project2 = db.components().insertPrivateProject(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); db.components().insertProjectBranch(project2, b -> b.setBranchType(PULL_REQUEST).setKey("p2-pr-1")); - ComponentDto project3 = db.components().insertPrivateProject(); + ComponentDto project3 = db.components().insertPrivateProject().getMainBranchComponent(); db.components().insertProjectBranch(project3, b -> b.setBranchType(BRANCH).setKey("p3-branch-1")); MetricDto unanalyzedC = db.measures().insertMetric(m -> m.setKey("unanalyzed_c")); @@ -610,14 +610,14 @@ public class BranchDaoIT { @Test public void selectProjectUuidsWithIssuesNeedSync() { - ComponentDto project1 = db.components().insertPrivateProject(); - ComponentDto project2 = db.components().insertPrivateProject(); - ComponentDto project3 = db.components().insertPrivateProject(); - ComponentDto project4 = db.components().insertPrivateProject(); - ProjectDto project1Dto = db.components().getProjectDto(project1); - ProjectDto project2Dto = db.components().getProjectDto(project2); - ProjectDto project3Dto = db.components().getProjectDto(project3); - ProjectDto project4Dto = db.components().getProjectDto(project4); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project3 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project4 = db.components().insertPrivateProject().getMainBranchComponent(); + ProjectDto project1Dto = db.components().getProjectDtoByMainBranch(project1); + ProjectDto project2Dto = db.components().getProjectDtoByMainBranch(project2); + ProjectDto project3Dto = db.components().getProjectDtoByMainBranch(project3); + ProjectDto project4Dto = db.components().getProjectDtoByMainBranch(project4); BranchDto branch1 = db.components().insertProjectBranch(project1Dto, branchDto -> branchDto.setNeedIssueSync(true)); BranchDto branch2 = db.components().insertProjectBranch(project1Dto, branchDto -> branchDto.setNeedIssueSync(false)); @@ -633,13 +633,13 @@ public class BranchDaoIT { assertThat(underTest.hasAnyBranchWhereNeedIssueSync(dbSession, true)).isFalse(); assertThat(underTest.hasAnyBranchWhereNeedIssueSync(dbSession, false)).isFalse(); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto branch = db.components().insertProjectBranch(project, b -> b.setNeedIssueSync(false)); assertThat(underTest.hasAnyBranchWhereNeedIssueSync(dbSession, true)).isFalse(); assertThat(underTest.hasAnyBranchWhereNeedIssueSync(dbSession, false)).isTrue(); - project = db.components().insertPrivateProject(); + project = db.components().insertPrivateProject().getMainBranchComponent(); branch = db.components().insertProjectBranch(project, b -> b.setNeedIssueSync(true)); assertThat(underTest.hasAnyBranchWhereNeedIssueSync(dbSession, true)).isTrue(); } @@ -648,7 +648,7 @@ public class BranchDaoIT { public void countByTypeAndCreationDate() { assertThat(underTest.countByTypeAndCreationDate(dbSession, BranchType.BRANCH, 0L)).isZero(); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto branch1 = db.components().insertProjectBranch(project, b -> b.setBranchType(BranchType.BRANCH)); ComponentDto branch2 = db.components().insertProjectBranch(project, b -> b.setBranchType(BranchType.BRANCH)); ComponentDto pr = db.components().insertProjectBranch(project, b -> b.setBranchType(BranchType.PULL_REQUEST)); @@ -666,7 +666,7 @@ public class BranchDaoIT { assertThat(underTest.countByNeedIssueSync(dbSession, false)).isZero(); // master branch with flag set to false - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); // branches & PRs db.components().insertProjectBranch(project, b -> b.setBranchType(BranchType.BRANCH).setNeedIssueSync(true)); db.components().insertProjectBranch(project, b -> b.setBranchType(BranchType.BRANCH).setNeedIssueSync(true)); @@ -684,7 +684,7 @@ public class BranchDaoIT { public void countAll() { assertThat(underTest.countAll(dbSession)).isZero(); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); db.components().insertProjectBranch(project, b -> b.setBranchType(BranchType.BRANCH).setNeedIssueSync(true)); db.components().insertProjectBranch(project, b -> b.setBranchType(BranchType.BRANCH).setNeedIssueSync(true)); db.components().insertProjectBranch(project, b -> b.setBranchType(BranchType.BRANCH).setNeedIssueSync(false)); @@ -698,7 +698,7 @@ public class BranchDaoIT { @Test public void selectBranchNeedingIssueSync() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); String uuid = db.components().insertProjectBranch(project, b -> b.setBranchType(BranchType.BRANCH).setNeedIssueSync(true)).uuid(); db.components().insertProjectBranch(project, b -> b.setBranchType(BranchType.BRANCH).setNeedIssueSync(false)); @@ -709,7 +709,7 @@ public class BranchDaoIT { @Test public void selectBranchNeedingIssueSyncForProject() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); String uuid = db.components().insertProjectBranch(project, b -> b.setBranchType(BranchType.BRANCH).setNeedIssueSync(true)).uuid(); db.components().insertProjectBranch(project, b -> b.setBranchType(BranchType.BRANCH).setNeedIssueSync(false)); @@ -720,7 +720,7 @@ public class BranchDaoIT { @Test public void updateAllNeedIssueSync() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); String uuid1 = db.components().insertProjectBranch(project, b -> b.setBranchType(BranchType.BRANCH).setNeedIssueSync(true)).uuid(); String uuid2 = db.components().insertProjectBranch(project, b -> b.setBranchType(BranchType.BRANCH).setNeedIssueSync(false)).uuid(); @@ -737,7 +737,7 @@ public class BranchDaoIT { @Test public void updateAllNeedIssueSyncForProject() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); String uuid1 = db.components().insertProjectBranch(project, b -> b.setBranchType(BranchType.BRANCH).setNeedIssueSync(true)).uuid(); String uuid2 = db.components().insertProjectBranch(project, b -> b.setBranchType(BranchType.BRANCH).setNeedIssueSync(false)).uuid(); @@ -754,7 +754,7 @@ public class BranchDaoIT { @Test public void updateNeedIssueSync() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); String uuid1 = db.components().insertProjectBranch(project, b -> b.setBranchType(BranchType.BRANCH).setNeedIssueSync(false)).uuid(); String uuid2 = db.components().insertProjectBranch(project, b -> b.setBranchType(BranchType.BRANCH).setNeedIssueSync(true)).uuid(); @@ -774,9 +774,9 @@ public class BranchDaoIT { public void doAnyOfComponentsNeedIssueSync() { assertThat(underTest.doAnyOfComponentsNeedIssueSync(dbSession, emptyList())).isFalse(); - ComponentDto project1 = db.components().insertPrivateProject(); - ComponentDto project2 = db.components().insertPrivateProject(); - ProjectDto projectDto = db.components().getProjectDto(project1); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); + ProjectDto projectDto = db.components().getProjectDtoByMainBranch(project1); db.components().insertProjectBranch(projectDto, b -> b.setBranchType(BranchType.BRANCH).setNeedIssueSync(true)); BranchDto projectBranch1 = db.components().insertProjectBranch(projectDto, b -> b.setBranchType(BranchType.BRANCH).setNeedIssueSync(true)); BranchDto projectBranch2 = db.components().insertProjectBranch(projectDto, b -> b.setBranchType(BranchType.BRANCH).setNeedIssueSync(false)); @@ -791,14 +791,14 @@ public class BranchDaoIT { @Test public void doAnyOfComponentsNeedIssueSync_test_more_than_1000() { - List componentKeys = IntStream.range(0, 1100).mapToObj(value -> db.components().insertPrivateProject()) + List componentKeys = IntStream.range(0, 1100).mapToObj(value -> db.components().insertPrivateProject().getMainBranchComponent()) .map(ComponentDto::getKey) .collect(Collectors.toList()); assertThat(underTest.doAnyOfComponentsNeedIssueSync(dbSession, componentKeys)).isFalse(); - ComponentDto project = db.components().insertPrivateProject(); - ProjectDto projectDto = db.components().getProjectDto(project); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); + ProjectDto projectDto = db.components().getProjectDtoByMainBranch(project); db.components().insertProjectBranch(projectDto, b -> b.setBranchType(BranchType.BRANCH).setNeedIssueSync(true)); componentKeys.add(project.getKey()); @@ -817,7 +817,7 @@ public class BranchDaoIT { @Test @UseDataProvider("booleanValues") public void isBranchNeedIssueSync_shouldReturnCorrectValue(boolean needIssueSync) { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); String branchUuid = db.components().insertProjectBranch(project, branch -> branch.setBranchType(BranchType.BRANCH).setNeedIssueSync(needIssueSync)).uuid(); assertThat(underTest.isBranchNeedIssueSync(dbSession, branchUuid)).isEqualTo(needIssueSync); diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/component/ComponentDaoIT.java b/server/sonar-db-dao/src/it/java/org/sonar/db/component/ComponentDaoIT.java index 5349f72589f..a51ca2af3b1 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/component/ComponentDaoIT.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/component/ComponentDaoIT.java @@ -131,8 +131,8 @@ public class ComponentDaoIT { ComponentDto project = db.components().insertPrivateProject(p -> p .setKey("org.struts:struts") .setName("Struts") - .setLongName("Apache Struts")); - ComponentDto anotherProject = db.components().insertPrivateProject(); + .setLongName("Apache Struts")).getMainBranchComponent(); + ComponentDto anotherProject = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto result = underTest.selectByUuid(dbSession, project.uuid()).get(); assertThat(result).isNotNull(); @@ -158,9 +158,9 @@ public class ComponentDaoIT { ComponentDto project = db.components().insertPublicProject(p -> p .setKey("org.struts:struts") .setName("Struts") - .setLongName("Apache Struts")); + .setLongName("Apache Struts")).getMainBranchComponent(); ComponentDto projectCopy = db.components().insertComponent(newProjectCopy(project, view)); - ComponentDto anotherProject = db.components().insertPrivateProject(); + ComponentDto anotherProject = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto anotherProjectCopy = db.components().insertComponent(newProjectCopy(anotherProject, view)); ComponentDto result = underTest.selectByUuid(dbSession, projectCopy.uuid()).get(); @@ -179,8 +179,8 @@ public class ComponentDaoIT { @Test public void selectByUuid_on_disabled_component() { - ComponentDto enabledProject = db.components().insertPublicProject(p -> p.setEnabled(true)); - ComponentDto disabledProject = db.components().insertPublicProject(p -> p.setEnabled(false)); + ComponentDto enabledProject = db.components().insertPublicProject(p -> p.setEnabled(true)).getMainBranchComponent(); + ComponentDto disabledProject = db.components().insertPublicProject(p -> p.setEnabled(false)).getMainBranchComponent(); ComponentDto result = underTest.selectByUuid(dbSession, disabledProject.uuid()).get(); assertThat(result).isNotNull(); @@ -189,7 +189,7 @@ public class ComponentDaoIT { @Test public void selectOrFailByUuid_fails_when_component_not_found() { - db.components().insertPublicProject(); + db.components().insertPublicProject().getMainBranchComponent(); assertThatThrownBy(() -> underTest.selectOrFailByUuid(dbSession, "unknown")) .isInstanceOf(RowNotFoundException.class); @@ -197,7 +197,7 @@ public class ComponentDaoIT { @Test public void select_by_key() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto branch = db.components().insertProjectBranch(project); ComponentDto directory = db.components().insertComponent(newDirectory(project, "src")); ComponentDto file = db.components().insertComponent(newFileDto(project, directory) @@ -226,7 +226,7 @@ public class ComponentDaoIT { @Test public void select_by_key_and_branch() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto branch = db.components().insertProjectBranch(project, b -> b.setKey("my_branch").setBranchType(BRANCH)); ComponentDto file = db.components().insertComponent(newFileDto(branch, project.uuid())); @@ -239,7 +239,7 @@ public class ComponentDaoIT { @Test public void select_by_key_and_pull_request() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto branch = db.components().insertProjectBranch(project, b -> b.setKey("my_branch")); ComponentDto pullRequest = db.components().insertProjectBranch(project, b -> b.setKey("my_PR").setBranchType(PULL_REQUEST)); ComponentDto pullRequestNamedAsMainBranch = db.components().insertProjectBranch(project, b -> b.setKey("master").setBranchType(PULL_REQUEST)); @@ -256,7 +256,7 @@ public class ComponentDaoIT { @Test public void get_by_key_on_disabled_component() { - ComponentDto project = db.components().insertPrivateProject(p -> p.setEnabled(false)); + ComponentDto project = db.components().insertPrivateProject(p -> p.setEnabled(false)).getMainBranchComponent(); ComponentDto result = underTest.selectByKey(dbSession, project.getKey()).get(); @@ -265,7 +265,7 @@ public class ComponentDaoIT { @Test public void get_by_key_on_a_root_project() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto result = underTest.selectByKey(dbSession, project.getKey()).get(); @@ -277,9 +277,9 @@ public class ComponentDaoIT { @Test public void selectByKeys_whenPassingKeys_shouldReturnComponentsInMainBranch() { - ComponentDto project1 = db.components().insertPrivateProject(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto branch = db.components().insertProjectBranch(project1); - ComponentDto project2 = db.components().insertPrivateProject(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); List results = underTest.selectByKeys(dbSession, asList(project1.getKey(), project2.getKey())); @@ -294,10 +294,10 @@ public class ComponentDaoIT { @Test public void selectByKeys_whenAppWithMultipleBranches_shouldReturnMainBranch() { - ProjectDto proj = db.components().insertPrivateProjectDto(); + ProjectDto proj = db.components().insertPrivateProject().getProjectDto(); BranchDto projBranch = db.components().insertProjectBranch(proj); - ProjectDto app = db.components().insertPrivateApplicationDto(); + ProjectDto app = db.components().insertPrivateApplication().getProjectDto(); BranchDto appBranch = db.components().insertProjectBranch(app); db.components().addApplicationProject(app, proj); @@ -359,7 +359,7 @@ public class ComponentDaoIT { @Test public void selectByKeys_whenSpecifyingBranch_shouldReturnComponentsInIt() { String branchKey = "my_branch"; - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto branch = db.components().insertProjectBranch(project, b -> b.setKey(branchKey)); ComponentDto file1 = db.components().insertComponent(newFileDto(branch, project.uuid())); ComponentDto file2 = db.components().insertComponent(newFileDto(branch, project.uuid())); @@ -379,7 +379,7 @@ public class ComponentDaoIT { @Test public void selectByKeys_whenSpecifyingPR_shouldReturnComponentsInIt() { String prKey = "my_branch"; - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto pr = db.components().insertProjectBranch(project, b -> b.setKey(prKey).setBranchType(PULL_REQUEST)); ComponentDto file1 = db.components().insertComponent(newFileDto(pr)); ComponentDto anotherBranch = db.components().insertProjectBranch(project, b -> b.setKey(prKey)); @@ -397,8 +397,8 @@ public class ComponentDaoIT { @Test public void get_by_uuids() { - ComponentDto project1 = db.components().insertPrivateProject(); - ComponentDto project2 = db.components().insertPrivateProject(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); List results = underTest.selectByUuids(dbSession, asList(project1.uuid(), project2.uuid())); @@ -413,8 +413,8 @@ public class ComponentDaoIT { @Test public void get_by_uuids_on_removed_components() { - ComponentDto project1 = db.components().insertPrivateProject(); - ComponentDto project2 = db.components().insertPrivateProject(p -> p.setEnabled(false)); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project2 = db.components().insertPrivateProject(p -> p.setEnabled(false)).getMainBranchComponent(); List results = underTest.selectByUuids(dbSession, asList(project1.uuid(), project2.uuid())); @@ -427,8 +427,8 @@ public class ComponentDaoIT { @Test public void select_existing_uuids() { - ComponentDto project1 = db.components().insertPrivateProject(); - ComponentDto project2 = db.components().insertPrivateProject(p -> p.setEnabled(false)); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project2 = db.components().insertPrivateProject(p -> p.setEnabled(false)).getMainBranchComponent(); assertThat(underTest.selectExistingUuids(dbSession, asList(project1.uuid(), project2.uuid()))).containsExactlyInAnyOrder(project1.uuid(), project2.uuid()); assertThat(underTest.selectExistingUuids(dbSession, asList(project1.uuid(), "unknown"))).containsExactlyInAnyOrder(project1.uuid()); @@ -437,7 +437,7 @@ public class ComponentDaoIT { @Test public void select_component_keys_by_qualifiers() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto directory = db.components().insertComponent(newDirectory(project, "src")); ComponentDto file = db.components().insertComponent(newFileDto(directory)); @@ -457,8 +457,8 @@ public class ComponentDaoIT { @Test public void find_sub_projects_by_component_keys() { - ComponentDto project = db.components().insertPrivateProject(); - ComponentDto removedProject = db.components().insertPrivateProject(p -> p.setEnabled(false)); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto removedProject = db.components().insertPrivateProject(p -> p.setEnabled(false)).getMainBranchComponent(); ComponentDto directory = db.components().insertComponent(newDirectory(project, "src")); ComponentDto removedDirectory = db.components().insertComponent(newDirectory(project, "src2").setEnabled(false)); ComponentDto file = db.components().insertComponent(newFileDto(project, directory)); @@ -485,7 +485,7 @@ public class ComponentDaoIT { @Test public void select_enabled_files_from_project() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto directory = db.components().insertComponent(newDirectory(project, "src")); ComponentDto file = db.components().insertComponent(newFileDto(project, directory)); FileSourceDto fileSource = db.fileSources().insertFileSource(file); @@ -504,8 +504,8 @@ public class ComponentDaoIT { @Test public void select_by_branch_uuid() { - ComponentDto project = db.components().insertPrivateProject(); - ComponentDto removedProject = db.components().insertPrivateProject(p -> p.setEnabled(false)); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto removedProject = db.components().insertPrivateProject(p -> p.setEnabled(false)).getMainBranchComponent(); ComponentDto directory = db.components().insertComponent(newDirectory(project, "src")); ComponentDto removedDirectory = db.components().insertComponent(newDirectory(project, "src2").setEnabled(false)); ComponentDto file = db.components().insertComponent(newFileDto(project, directory)); @@ -521,9 +521,9 @@ public class ComponentDaoIT { @Test public void select_uuids_by_key_from_project() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto branch = db.components().insertProjectBranch(project); - ComponentDto removedProject = db.components().insertPrivateProject(p -> p.setEnabled(false)); + ComponentDto removedProject = db.components().insertPrivateProject(p -> p.setEnabled(false)).getMainBranchComponent(); ComponentDto directory = db.components().insertComponent(newDirectory(project, "src")); ComponentDto removedDirectory = db.components().insertComponent(newDirectory(project, "src2").setEnabled(false)); ComponentDto file = db.components().insertComponent(newFileDto(project, directory)); @@ -543,7 +543,7 @@ public class ComponentDaoIT { @Test public void select_uuids_by_key_from_project_and_branch() { String branchKey = "branch1"; - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto branch = db.components().insertProjectBranch(project, b -> b.setKey(branchKey)); ComponentDto pr = db.components().insertProjectBranch(project, b -> b.setKey(branchKey).setBranchType(PULL_REQUEST)); ComponentDto directory = db.components().insertComponent(newDirectory(branch, "src")); @@ -562,7 +562,7 @@ public class ComponentDaoIT { @Test public void select_uuids_by_key_from_project_and_pr() { String prKey = "pr1"; - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto branch = db.components().insertProjectBranch(project, b -> b.setKey(prKey).setBranchType(PULL_REQUEST)); ComponentDto pr = db.components().insertProjectBranch(project, b -> b.setKey(prKey).setBranchType(BRANCH)); ComponentDto directory = db.components().insertComponent(newDirectory(branch, "src")); @@ -587,7 +587,7 @@ public class ComponentDaoIT { ComponentDto view = db.components().insertPublicPortfolio("EFGH", p -> { }); db.components().insertSubView(view, dto -> dto.setUuid("FGHI")); - ComponentDto application = db.components().insertPublicApplication(); + ComponentDto application = db.components().insertPublicApplication().getMainBranchComponent(); assertThat(underTest.selectAllViewsAndSubViews(dbSession)).extracting(UuidWithBranchUuidDto::getUuid) .containsExactlyInAnyOrder("ABCD", "EFGH", "FGHI", "IJKL", application.uuid()); @@ -856,11 +856,11 @@ public class ComponentDaoIT { if (rootViewQualifier.equals(Qualifiers.VIEW)) { return random.nextBoolean() ? tester.insertPublicPortfolio(dtoPopulators) : tester.insertPrivatePortfolio(dtoPopulators); } - return random.nextBoolean() ? tester.insertPublicApplication(dtoPopulators) : tester.insertPrivatePortfolio(dtoPopulators); + return random.nextBoolean() ? tester.insertPublicApplication(dtoPopulators).getMainBranchComponent() : tester.insertPrivatePortfolio(dtoPopulators); } private ComponentDto insertProject() { - return random.nextBoolean() ? db.components().insertPrivateProject() : db.components().insertPublicProject(); + return random.nextBoolean() ? db.components().insertPrivateProject().getMainBranchComponent() : db.components().insertPublicProject().getMainBranchComponent(); } @SafeVarargs @@ -872,8 +872,8 @@ public class ComponentDaoIT { @Test public void select_projects_from_view() { - ComponentDto project1 = db.components().insertPrivateProject(); - ComponentDto project2 = db.components().insertPrivateProject(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto view = db.components().insertPublicPortfolio(); db.components().insertComponent(newProjectCopy(project1, view)); ComponentDto viewWithSubView = db.components().insertPublicPortfolio(); @@ -893,7 +893,7 @@ public class ComponentDaoIT { public void select_enabled_views_from_root_view() { ComponentDto rootPortfolio = db.components().insertPrivatePortfolio(); ComponentDto subPortfolio = db.components().insertSubView(rootPortfolio); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); db.components().insertComponent(newProjectCopy(project, subPortfolio)); assertThat(underTest.selectEnabledViewsFromRootView(dbSession, rootPortfolio.uuid())) @@ -904,9 +904,9 @@ public class ComponentDaoIT { @Test public void select_projects_from_view_should_escape_like_sensitive_characters() { - ComponentDto project1 = db.components().insertPrivateProject(); - ComponentDto project2 = db.components().insertPrivateProject(); - ComponentDto project3 = db.components().insertPrivateProject(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project3 = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto view = db.components().insertPrivatePortfolio(); @@ -925,7 +925,7 @@ public class ComponentDaoIT { @Test public void selectByQuery_provisioned() { ComponentDto provisionedProject = db.components() - .insertPrivateProject(p -> p.setKey("provisioned.project").setName("Provisioned Project")); + .insertPrivateProject(p -> p.setKey("provisioned.project").setName("Provisioned Project")).getMainBranchComponent(); ComponentDto provisionedPortfolio = db.components().insertPrivatePortfolio(); SnapshotDto analyzedProject = db.components().insertProjectAndSnapshot(newPrivateProjectDto()); @@ -974,7 +974,7 @@ public class ComponentDaoIT { .setOnProvisionedOnly(true); // the project does not have any analysis - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); assertThat(underTest.selectByQuery(dbSession, query.get().build(), 0, 10)) .extracting(ComponentDto::uuid) .containsOnly(project.uuid()); @@ -994,9 +994,9 @@ public class ComponentDaoIT { Date secondDate = new Date(system2.now()); Date thirdDate = new Date(system2.now()); - ComponentDto project3 = db.components().insertPrivateProject("project3", componentDto -> componentDto.setCreatedAt(thirdDate)); - ComponentDto project1 = db.components().insertPrivateProject("project1", componentDto -> componentDto.setCreatedAt(firstDate)); - ComponentDto project2 = db.components().insertPrivateProject("project2", componentDto -> componentDto.setCreatedAt(secondDate)); + ComponentDto project3 = db.components().insertPrivateProject("project3", componentDto -> componentDto.setCreatedAt(thirdDate)).getMainBranchComponent(); + ComponentDto project1 = db.components().insertPrivateProject("project1", componentDto -> componentDto.setCreatedAt(firstDate)).getMainBranchComponent(); + ComponentDto project2 = db.components().insertPrivateProject("project2", componentDto -> componentDto.setCreatedAt(secondDate)).getMainBranchComponent(); Supplier query = () -> ComponentQuery.builder() .setQualifiers(PROJECT) @@ -1013,7 +1013,7 @@ public class ComponentDaoIT { @Test public void count_provisioned() { - db.components().insertPrivateProject(); + db.components().insertPrivateProject().getMainBranchComponent(); db.components().insertProjectAndSnapshot(newPrivateProjectDto()); db.components().insertProjectAndSnapshot(ComponentTesting.newPortfolio()); Supplier query = () -> ComponentQuery.builder().setOnProvisionedOnly(true); @@ -1052,8 +1052,8 @@ public class ComponentDaoIT { @Test public void selectByProjectUuid() { - ComponentDto project = db.components().insertPrivateProject(); - ComponentDto removedProject = db.components().insertPrivateProject(p -> p.setEnabled(false)); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto removedProject = db.components().insertPrivateProject(p -> p.setEnabled(false)).getMainBranchComponent(); ComponentDto directory = db.components().insertComponent(newDirectory(project, "src")); ComponentDto removedDirectory = db.components().insertComponent(newDirectory(project, "src2").setEnabled(false)); ComponentDto file = db.components().insertComponent(newFileDto(project, directory)); @@ -1091,8 +1091,8 @@ public class ComponentDaoIT { } private ListAssert assertSelectForIndexing(@Nullable String projectUuid) { - ComponentDto project = db.components().insertPrivateProject("U1"); - ComponentDto removedProject = db.components().insertPrivateProject(p -> p.setEnabled(false)); + ComponentDto project = db.components().insertPrivateProject("U1").getMainBranchComponent(); + ComponentDto removedProject = db.components().insertPrivateProject(p -> p.setEnabled(false)).getMainBranchComponent(); ComponentDto directory = db.components().insertComponent(newDirectory(project, "U3", "src")); ComponentDto removedDirectory = db.components().insertComponent(newDirectory(project, "src2").setEnabled(false)); ComponentDto file = db.components().insertComponent(newFileDto(project, directory, "U4")); @@ -1102,7 +1102,7 @@ public class ComponentDaoIT { }); db.components().insertComponent(newProjectCopy("COPY8", project, view)); - ComponentDto project2 = db.components().insertPrivateProject("U5"); + ComponentDto project2 = db.components().insertPrivateProject("U5").getMainBranchComponent(); List components = new ArrayList<>(); underTest.scrollForIndexing(dbSession, projectUuid, @@ -1112,7 +1112,7 @@ public class ComponentDaoIT { @Test public void update() { - db.components().insertPrivateProject("U1"); + db.components().insertPrivateProject("U1").getMainBranchComponent(); underTest.update(dbSession, new ComponentUpdateDto() .setUuid("U1") @@ -1243,7 +1243,7 @@ public class ComponentDaoIT { @Test public void selectByQuery_should_not_return_branches() { - ComponentDto main = db.components().insertPublicProject(); + ComponentDto main = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto branch = db.components().insertProjectBranch(main); assertThat(underTest.selectByQuery(dbSession, ALL_PROJECTS_COMPONENT_QUERY, 0, 2)).hasSize(1); @@ -1252,7 +1252,7 @@ public class ComponentDaoIT { @Test public void countByQuery_should_not_include_branches() { - ComponentDto main = db.components().insertPublicProject(); + ComponentDto main = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto branch = db.components().insertProjectBranch(main); assertThat(underTest.countByQuery(dbSession, ALL_PROJECTS_COMPONENT_QUERY)).isOne(); @@ -1299,9 +1299,9 @@ public class ComponentDaoIT { public void selectByQuery_filter_last_analysis_date() { long aLongTimeAgo = 1_000_000_000L; long recentTime = 3_000_000_000L; - ComponentDto oldProject = db.components().insertPrivateProject(); + ComponentDto oldProject = db.components().insertPrivateProject().getMainBranchComponent(); db.components().insertSnapshot(oldProject, s -> s.setCreatedAt(aLongTimeAgo)); - ComponentDto recentProject = db.components().insertPrivateProject(); + ComponentDto recentProject = db.components().insertPrivateProject().getMainBranchComponent(); db.components().insertSnapshot(recentProject, s -> s.setCreatedAt(recentTime).setLast(true)); db.components().insertSnapshot(recentProject, s -> s.setCreatedAt(aLongTimeAgo).setLast(false)); @@ -1335,12 +1335,12 @@ public class ComponentDaoIT { long aLongTimeAgo = 1_000_000_000L; long recentTime = 3_000_000_000L; // project with only a non-main and old analyzed branch - ComponentDto oldProject = db.components().insertPublicProject(); + ComponentDto oldProject = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto oldProjectBranch = db.components().insertProjectBranch(oldProject, newBranchDto(oldProject).setBranchType(BRANCH)); db.components().insertSnapshot(oldProjectBranch, s -> s.setLast(true).setCreatedAt(aLongTimeAgo)); // project with only a old main branch and a recent non-main branch - ComponentDto recentProject = db.components().insertPublicProject(); + ComponentDto recentProject = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto recentProjectBranch = db.components().insertProjectBranch(recentProject, newBranchDto(recentProject).setBranchType(BRANCH)); db.components().insertSnapshot(recentProjectBranch, s -> s.setCreatedAt(recentTime).setLast(true)); db.components().insertSnapshot(recentProjectBranch, s -> s.setCreatedAt(aLongTimeAgo).setLast(false)); @@ -1372,12 +1372,12 @@ public class ComponentDaoIT { long aLongTimeAgo = 1_000_000_000L; long recentTime = 3_000_000_000L; // project with only a non-main and old analyzed branch - ComponentDto oldProject = db.components().insertPublicProject(); + ComponentDto oldProject = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto oldProjectBranch = db.components().insertProjectBranch(oldProject, newBranchDto(oldProject).setBranchType(BRANCH)); db.components().insertSnapshot(oldProjectBranch, s -> s.setLast(true).setCreatedAt(aLongTimeAgo)); // project with only a old main branch and a recent non-main branch - ComponentDto recentProject = db.components().insertPublicProject(); + ComponentDto recentProject = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto recentProjectBranch = db.components().insertProjectBranch(recentProject, newBranchDto(recentProject).setBranchType(BRANCH)); db.components().insertSnapshot(recentProjectBranch, s -> s.setCreatedAt(recentTime).setLast(true)); db.components().insertSnapshot(recentProjectBranch, s -> s.setCreatedAt(aLongTimeAgo).setLast(false)); @@ -1407,8 +1407,8 @@ public class ComponentDaoIT { @Test public void selectByQuery_filter_created_at() { - ComponentDto project1 = db.components().insertPrivateProject(p -> p.setCreatedAt(parseDate("2018-02-01"))); - ComponentDto project2 = db.components().insertPrivateProject(p -> p.setCreatedAt(parseDate("2018-06-01"))); + ComponentDto project1 = db.components().insertPrivateProject(p -> p.setCreatedAt(parseDate("2018-02-01"))).getMainBranchComponent(); + ComponentDto project2 = db.components().insertPrivateProject(p -> p.setCreatedAt(parseDate("2018-06-01"))).getMainBranchComponent(); assertThat(selectProjectUuidsByQuery(q -> q.setCreatedAfter(parseDate("2017-12-01")))) .containsExactlyInAnyOrder(project1.uuid(), project2.uuid()); @@ -1438,8 +1438,8 @@ public class ComponentDaoIT { @Test public void selectByQuery_filter_on_visibility() { - db.components().insertPrivateProject(p -> p.setKey("private-key")); - db.components().insertPublicProject(p -> p.setKey("public-key")); + db.components().insertPrivateProject(p -> p.setKey("private-key")).getMainBranchComponent(); + db.components().insertPublicProject(p -> p.setKey("public-key")).getMainBranchComponent(); ComponentQuery privateProjectsQuery = ComponentQuery.builder().setPrivate(true).setQualifiers(PROJECT).build(); ComponentQuery publicProjectsQuery = ComponentQuery.builder().setPrivate(false).setQualifiers(PROJECT).build(); @@ -1452,7 +1452,7 @@ public class ComponentDaoIT { @Test public void selectByQuery_on_empty_list_of_component_key() { - db.components().insertPrivateProject(); + db.components().insertPrivateProject().getMainBranchComponent(); ComponentQuery dbQuery = ComponentQuery.builder().setQualifiers(PROJECT).setComponentKeys(emptySet()).build(); List result = underTest.selectByQuery(dbSession, dbQuery, 0, 10); @@ -1464,9 +1464,9 @@ public class ComponentDaoIT { @Test public void selectByQuery_on_component_keys() { - ComponentDto sonarqube = db.components().insertPrivateProject(); - ComponentDto jdk8 = db.components().insertPrivateProject(); - ComponentDto cLang = db.components().insertPrivateProject(); + ComponentDto sonarqube = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto jdk8 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto cLang = db.components().insertPrivateProject().getMainBranchComponent(); ComponentQuery query = ComponentQuery.builder().setQualifiers(PROJECT) .setComponentKeys(newHashSet(sonarqube.getKey(), jdk8.getKey())).build(); @@ -1479,7 +1479,7 @@ public class ComponentDaoIT { @Test public void selectByQuery_on_empty_list_of_component_uuids() { - db.components().insertPrivateProject(); + db.components().insertPrivateProject().getMainBranchComponent(); ComponentQuery dbQuery = ComponentQuery.builder().setQualifiers(PROJECT).setComponentUuids(emptySet()).build(); List result = underTest.selectByQuery(dbSession, dbQuery, 0, 10); @@ -1491,9 +1491,9 @@ public class ComponentDaoIT { @Test public void selectByQuery_on_component_uuids() { - ComponentDto sonarqube = db.components().insertPrivateProject(); - ComponentDto jdk8 = db.components().insertPrivateProject(); - ComponentDto cLang = db.components().insertPrivateProject(); + ComponentDto sonarqube = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto jdk8 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto cLang = db.components().insertPrivateProject().getMainBranchComponent(); ComponentQuery query = ComponentQuery.builder().setQualifiers(PROJECT) .setComponentUuids(newHashSet(sonarqube.uuid(), jdk8.uuid())).build(); @@ -1722,17 +1722,17 @@ public class ComponentDaoIT { MetricDto metric = db.measures().insertMetric(m -> m.setKey("ncloc")); // project1, not the biggest branch - not returned - final ComponentDto project1 = db.components().insertPrivateProject(b -> b.setName("foo")); + final ComponentDto project1 = db.components().insertPrivateProject(b -> b.setName("foo")).getMainBranchComponent(); insertMeasure(20d, project1, metric); // branch of project1 - returned insertMeasure(30d, db.components().insertProjectBranch(project1, b -> b.setBranchType(BRANCH)), metric); // project2 - returned - insertMeasure(10d, db.components().insertPrivateProject(b -> b.setName("bar")), metric); + insertMeasure(10d, db.components().insertPrivateProject(b -> b.setName("bar")).getMainBranchComponent(), metric); // public project - not returned - insertMeasure(11d, db.components().insertPublicProject(b -> b.setName("other")), metric); + insertMeasure(11d, db.components().insertPublicProject(b -> b.setName("other")).getMainBranchComponent(), metric); List result = underTest.selectPrivateProjectsWithNcloc(db.getSession()); @@ -1764,7 +1764,7 @@ public class ComponentDaoIT { @Test public void selectComponentsFromBranchesThatHaveOpenIssues() { - final ProjectDto project = db.components().insertPrivateProjectDto(b -> b.setName("foo")); + final ProjectDto project = db.components().insertPrivateProject(b -> b.setName("foo")).getProjectDto(); ComponentDto branch1 = db.components().insertProjectBranch(project, ComponentTesting.newBranchDto(project.getUuid(), BRANCH).setKey("branch1")); ComponentDto fileBranch1 = db.components().insertComponent(ComponentTesting.newFileDto(branch1)); @@ -1783,7 +1783,7 @@ public class ComponentDaoIT { @Test public void selectComponentsFromBranchesThatHaveOpenIssues_returns_nothing_if_no_open_issues_in_sibling_branches() { - final ProjectDto project = db.components().insertPrivateProjectDto(b -> b.setName("foo")); + final ProjectDto project = db.components().insertPrivateProject(b -> b.setName("foo")).getProjectDto(); ComponentDto branch1 = db.components().insertProjectBranch(project, ComponentTesting.newBranchDto(project.getUuid(), BRANCH).setKey("branch1")); ComponentDto fileBranch1 = db.components().insertComponent(ComponentTesting.newFileDto(branch1)); RuleDto rule = db.rules().insert(); @@ -1829,7 +1829,7 @@ public class ComponentDaoIT { @Test public void insert_branch_auditPersisterIsNotCalled() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); BranchDto branch = newBranchDto(project); ComponentDto branchComponent = newBranchComponent(project, branch); @@ -1841,7 +1841,7 @@ public class ComponentDaoIT { @Test public void selectByKeyCaseInsensitive_shouldFindProject_whenCaseIsDifferent() { String projectKey = randomAlphabetic(5).toLowerCase(); - db.components().insertPrivateProject(c -> c.setKey(projectKey)); + db.components().insertPrivateProject(c -> c.setKey(projectKey)).getMainBranchComponent(); ComponentDto result = underTest.selectByKeyCaseInsensitive(db.getSession(), projectKey.toUpperCase()).orElse(null); @@ -1852,7 +1852,7 @@ public class ComponentDaoIT { @Test public void selectByKeyCaseInsensitive_should_not_match_non_main_branch() { String projectKey = randomAlphabetic(5).toLowerCase(); - ProjectDto project = db.components().insertPrivateProjectDto(c -> c.setKey(projectKey)); + ProjectDto project = db.components().insertPrivateProject(c -> c.setKey(projectKey)).getProjectDto(); BranchDto projectBranch = db.components().insertProjectBranch(project); ComponentDto file = db.components().insertFile(projectBranch); @@ -1864,7 +1864,7 @@ public class ComponentDaoIT { @Test public void selectByKeyCaseInsensitive_shouldNotFindProject_whenKeyIsDifferent() { String projectKey = randomAlphabetic(5).toLowerCase(); - db.components().insertPrivateProject(c -> c.setKey(projectKey)); + db.components().insertPrivateProject(c -> c.setKey(projectKey)).getMainBranchComponent(); Optional result = underTest.selectByKeyCaseInsensitive(db.getSession(), projectKey + randomAlphabetic(1)); diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/component/ComponentKeyUpdaterDaoIT.java b/server/sonar-db-dao/src/it/java/org/sonar/db/component/ComponentKeyUpdaterDaoIT.java index b2a5fff2f8f..13d60db267f 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/component/ComponentKeyUpdaterDaoIT.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/component/ComponentKeyUpdaterDaoIT.java @@ -95,7 +95,7 @@ public class ComponentKeyUpdaterDaoIT { @Test public void updateKey_updates_branches_too() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); String branchName = randomAlphanumeric(248); ComponentDto branch = db.components().insertProjectBranch(project, b -> b.setKey(branchName)); db.components().insertComponent(newFileDto(branch, project.uuid())); @@ -121,7 +121,7 @@ public class ComponentKeyUpdaterDaoIT { @Test public void updateKey_updates_pull_requests_too() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); String pullRequestKey1 = randomAlphanumeric(100); ComponentDto pullRequest = db.components().insertProjectBranch(project, b -> b.setBranchType(PULL_REQUEST).setKey(pullRequestKey1)); db.components().insertComponent(newFileDto(pullRequest)); @@ -184,9 +184,9 @@ public class ComponentKeyUpdaterDaoIT { } private void populateSomeData() { - ComponentDto project1 = db.components().insertPrivateProject(t -> t.setKey("org.struts:struts").setUuid("A").setBranchUuid("A")); + ComponentDto project1 = db.components().insertPrivateProject(t -> t.setKey("org.struts:struts").setUuid("A").setBranchUuid("A")).getMainBranchComponent(); ComponentDto directory1 = db.components().insertComponent(newDirectory(project1, "/src/org/struts").setUuid("B")); db.components().insertComponent(ComponentTesting.newFileDto(project1, directory1).setKey("org.struts:struts:/src/org/struts/RequestContext.java").setUuid("C")); - ComponentDto project2 = db.components().insertPublicProject(t -> t.setKey("foo:struts-core").setUuid("D")); + ComponentDto project2 = db.components().insertPublicProject(t -> t.setKey("foo:struts-core").setUuid("D")).getMainBranchComponent(); } } diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/component/ProjectLinkDaoIT.java b/server/sonar-db-dao/src/it/java/org/sonar/db/component/ProjectLinkDaoIT.java index c68af53a84a..466a8cc7060 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/component/ProjectLinkDaoIT.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/component/ProjectLinkDaoIT.java @@ -44,7 +44,7 @@ public class ProjectLinkDaoIT { @Test public void select_by_id() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ProjectLinkDto link = db.componentLinks().insertProvidedLink(project, c -> c .setUuid("ABCD") .setName("Home") @@ -64,11 +64,11 @@ public class ProjectLinkDaoIT { @Test public void select_by_project_uuid() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ProjectLinkDto link1 = db.componentLinks().insertProvidedLink(project); ProjectLinkDto link2 = db.componentLinks().insertProvidedLink(project); ProjectLinkDto link3 = db.componentLinks().insertProvidedLink(project); - ComponentDto otherProject = db.components().insertPrivateProject(); + ComponentDto otherProject = db.components().insertPrivateProject().getMainBranchComponent(); ProjectLinkDto otherLink = db.componentLinks().insertProvidedLink(otherProject); assertThat(underTest.selectByProjectUuid(db.getSession(), project.uuid())) @@ -82,10 +82,10 @@ public class ProjectLinkDaoIT { @Test public void select_by_project_uuids() { - ComponentDto project1 = db.components().insertPrivateProject(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); ProjectLinkDto link1 = db.componentLinks().insertProvidedLink(project1); ProjectLinkDto link2 = db.componentLinks().insertProvidedLink(project1); - ComponentDto project2 = db.components().insertPrivateProject(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); ProjectLinkDto link3 = db.componentLinks().insertProvidedLink(project2); assertThat(underTest.selectByProjectUuids(db.getSession(), asList(project1.uuid(), project2.uuid()))) @@ -99,7 +99,7 @@ public class ProjectLinkDaoIT { @Test public void insert() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ProjectLinkDto link = ProjectLinkTesting.newProvidedLinkDto() .setUuid("ABCD") .setProjectUuid(project.uuid()) @@ -125,7 +125,7 @@ public class ProjectLinkDaoIT { @Test public void update() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ProjectLinkDto link = db.componentLinks().insertProvidedLink(project, c -> c .setUuid("ABCD") .setType("ci") @@ -134,7 +134,7 @@ public class ProjectLinkDaoIT { // Force dates to be in the past db.executeUpdateSql("UPDATE project_links SET created_at=" + PAST + " ,updated_at=" + PAST); - ComponentDto project2 = db.components().insertPrivateProject(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); underTest.update(db.getSession(), link .setProjectUuid(project2.uuid()) .setType("homepage") @@ -154,7 +154,7 @@ public class ProjectLinkDaoIT { @Test public void delete() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ProjectLinkDto link = db.componentLinks().insertProvidedLink(project); underTest.delete(db.getSession(), link.getUuid()); diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/component/ScrollForFileMoveComponentDaoIT.java b/server/sonar-db-dao/src/it/java/org/sonar/db/component/ScrollForFileMoveComponentDaoIT.java index dd78e925e26..6cf2cba89f1 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/component/ScrollForFileMoveComponentDaoIT.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/component/ScrollForFileMoveComponentDaoIT.java @@ -61,14 +61,14 @@ public class ScrollForFileMoveComponentDaoIT { @Test public void scrollAllFilesForFileMove_has_no_effect_if_project_has_no_file() { - ComponentDto project = random.nextBoolean() ? db.components().insertPrivateProject() : db.components().insertPublicProject(); + ComponentDto project = random.nextBoolean() ? db.components().insertPrivateProject().getMainBranchComponent() : db.components().insertPublicProject().getMainBranchComponent(); underTest.scrollAllFilesForFileMove(dbSession, project.uuid(), resultContext -> fail("handler should not be called")); } @Test public void scrollAllFilesForFileMove_ignores_files_with_null_path() { - ComponentDto project = random.nextBoolean() ? db.components().insertPrivateProject() : db.components().insertPublicProject(); + ComponentDto project = random.nextBoolean() ? db.components().insertPrivateProject().getMainBranchComponent() : db.components().insertPublicProject().getMainBranchComponent(); ComponentAndSource file = insertFileAndSource(project, FILE); ComponentAndSource ut = insertFileAndSource(project, UNIT_TEST_FILE); ComponentDto fileNoPath = db.components().insertComponent(ComponentTesting.newFileDto(project).setPath(null).setQualifier(FILE)); @@ -86,7 +86,7 @@ public class ScrollForFileMoveComponentDaoIT { @Test public void scrollAllFilesForFileMove_ignores_files_without_source() { - ComponentDto project = random.nextBoolean() ? db.components().insertPrivateProject() : db.components().insertPublicProject(); + ComponentDto project = random.nextBoolean() ? db.components().insertPrivateProject().getMainBranchComponent() : db.components().insertPublicProject().getMainBranchComponent(); ComponentAndSource file = insertFileAndSource(project, FILE); ComponentAndSource ut = insertFileAndSource(project, UNIT_TEST_FILE); ComponentDto fileNoSource = db.components().insertComponent(ComponentTesting.newFileDto(project).setPath(null).setQualifier(FILE)); @@ -102,7 +102,7 @@ public class ScrollForFileMoveComponentDaoIT { @Test public void scrollAllFilesForFileMove_scrolls_files_of_project() { - ComponentDto project = random.nextBoolean() ? db.components().insertPrivateProject() : db.components().insertPublicProject(); + ComponentDto project = random.nextBoolean() ? db.components().insertPrivateProject().getMainBranchComponent() : db.components().insertPublicProject().getMainBranchComponent(); ComponentDto dir1 = db.components().insertComponent(ComponentTesting.newDirectory(project, "path")); ComponentDto dir2 = db.components().insertComponent(ComponentTesting.newDirectory(dir1, "path2")); ComponentAndSource file1 = insertFileAndSource(project, FILE); @@ -120,7 +120,7 @@ public class ScrollForFileMoveComponentDaoIT { @Test public void scrollAllFilesForFileMove_scrolls_large_number_of_files_and_uts() { - ComponentDto project = random.nextBoolean() ? db.components().insertPrivateProject() : db.components().insertPublicProject(); + ComponentDto project = random.nextBoolean() ? db.components().insertPrivateProject().getMainBranchComponent() : db.components().insertPublicProject().getMainBranchComponent(); List files = IntStream.range(0, 300 + random.nextInt(500)) .mapToObj(i -> { String qualifier = random.nextBoolean() ? FILE : UNIT_TEST_FILE; @@ -139,7 +139,7 @@ public class ScrollForFileMoveComponentDaoIT { @Test public void scrollAllFilesForFileMove_scrolls_unit_tests_of_project() { - ComponentDto project = random.nextBoolean() ? db.components().insertPrivateProject() : db.components().insertPublicProject(); + ComponentDto project = random.nextBoolean() ? db.components().insertPrivateProject().getMainBranchComponent() : db.components().insertPublicProject().getMainBranchComponent(); ComponentAndSource ut = insertFileAndSource(project, UNIT_TEST_FILE); RecordingResultHandler resultHandler = new RecordingResultHandler(); @@ -152,7 +152,7 @@ public class ScrollForFileMoveComponentDaoIT { @Test @UseDataProvider("branchTypes") public void scrollAllFilesForFileMove_scrolls_files_and_unit_tests_of_branch(BranchType branchType) { - ComponentDto project = random.nextBoolean() ? db.components().insertPrivateProject() : db.components().insertPublicProject(); + ComponentDto project = random.nextBoolean() ? db.components().insertPrivateProject().getMainBranchComponent() : db.components().insertPublicProject().getMainBranchComponent(); ComponentDto branch = db.components().insertProjectBranch(project, t -> t.setBranchType(branchType)); ComponentAndSource file = insertFileAndSource(branch, FILE); ComponentAndSource ut = insertFileAndSource(branch, UNIT_TEST_FILE); @@ -175,7 +175,7 @@ public class ScrollForFileMoveComponentDaoIT { @Test public void scrollAllFilesForFileMove_ignores_non_file_and_non_ut_component_with_source() { - ComponentDto project = random.nextBoolean() ? db.components().insertPrivateProject() : db.components().insertPublicProject(); + ComponentDto project = random.nextBoolean() ? db.components().insertPrivateProject().getMainBranchComponent() : db.components().insertPublicProject().getMainBranchComponent(); db.fileSources().insertFileSource(project); ComponentDto dir = db.components().insertComponent(ComponentTesting.newDirectory(project, "foo")); db.fileSources().insertFileSource(dir); @@ -185,7 +185,7 @@ public class ScrollForFileMoveComponentDaoIT { db.fileSources().insertFileSource(portfolio); ComponentDto subView = db.components().insertSubView(portfolio); db.fileSources().insertFileSource(subView); - ComponentDto application = random.nextBoolean() ? db.components().insertPrivateApplication() : db.components().insertPublicApplication(); + ComponentDto application = random.nextBoolean() ? db.components().insertPrivateApplication().getMainBranchComponent() : db.components().insertPublicApplication().getMainBranchComponent(); db.fileSources().insertFileSource(application); RecordingResultHandler resultHandler = new RecordingResultHandler(); diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/component/SnapshotDaoIT.java b/server/sonar-db-dao/src/it/java/org/sonar/db/component/SnapshotDaoIT.java index 2e9c92011d4..cf3916b45ee 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/component/SnapshotDaoIT.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/component/SnapshotDaoIT.java @@ -73,7 +73,7 @@ public class SnapshotDaoIT { @Test public void selectByUuid() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); db.components().insertSnapshot(newAnalysis(project) .setUuid("ABCD") .setStatus("P") @@ -113,11 +113,11 @@ public class SnapshotDaoIT { @Test public void selectLastAnalysisByRootComponentUuid_returns_snapshot_flagged_as_last() { - ComponentDto project1 = db.components().insertPrivateProject(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); db.components().insertSnapshot(project1, t -> t.setLast(false)); SnapshotDto lastSnapshot1 = db.components().insertSnapshot(project1, t -> t.setLast(true)); db.components().insertSnapshot(project1, t -> t.setLast(false)); - ComponentDto project2 = db.components().insertPrivateProject(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); db.components().insertSnapshot(project2, t -> t.setLast(false)); SnapshotDto lastSnapshot2 = db.components().insertSnapshot(project2, t -> t.setLast(true)); db.components().insertSnapshot(project2, t -> t.setLast(false)); @@ -133,7 +133,7 @@ public class SnapshotDaoIT { @Test public void selectLastAnalysisByRootComponentUuid_returns_absent_if_only_unprocessed_snapshots() { - ComponentDto project1 = db.components().insertPrivateProject(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); db.components().insertSnapshot(project1, t -> t.setLast(false)); db.components().insertSnapshot(project1, t -> t.setLast(false)); db.components().insertSnapshot(project1, t -> t.setLast(false)); @@ -165,7 +165,7 @@ public class SnapshotDaoIT { @Test public void selectLastAnalysisDateByProject_takes_all_branches_into_account() { - ComponentDto firstProject = db.components().insertPrivateProject(); + ComponentDto firstProject = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto branch1 = db.components().insertProjectBranch(firstProject); ComponentDto branch2 = db.components().insertProjectBranch(firstProject); @@ -184,7 +184,7 @@ public class SnapshotDaoIT { @Test public void selectLastAnalysisDateByProject_is_empty_if_no_snapshot() { - ComponentDto firstProject = db.components().insertPrivateProject(); + ComponentDto firstProject = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto branch1 = db.components().insertProjectBranch(firstProject); ComponentDto branch2 = db.components().insertProjectBranch(firstProject); @@ -198,13 +198,13 @@ public class SnapshotDaoIT { @Test public void selectLastAnalysisDateByProjects_returns_all_existing_projects_with_a_snapshot() { - ComponentDto project1 = db.components().insertPrivateProject(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); - ComponentDto project2 = db.components().insertPrivateProject(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto branch1 = db.components().insertProjectBranch(project2); ComponentDto branch2 = db.components().insertProjectBranch(project2); - ComponentDto project3 = db.components().insertPrivateProject(); + ComponentDto project3 = db.components().insertPrivateProject().getMainBranchComponent(); dbClient.snapshotDao().insert(dbSession, newAnalysis(project1).setLast(false).setCreatedAt(2L)); dbClient.snapshotDao().insert(dbSession, newAnalysis(project1).setLast(true).setCreatedAt(1L)); @@ -222,7 +222,7 @@ public class SnapshotDaoIT { @Test public void selectLastAnalysisDateByProjects_returns_all_existing_projects_and_portfolios_with_a_snapshot() { - ComponentDto project1 = db.components().insertPrivateProject(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto branch1 = db.components().insertProjectBranch(project1); ComponentDto portfolio = db.components().insertPrivatePortfolio(); @@ -242,7 +242,7 @@ public class SnapshotDaoIT { Random random = new Random(); List snapshots = IntStream.range(0, 1 + random.nextInt(5)) .mapToObj(i -> { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); return IntStream.range(0, 1 + random.nextInt(20)) .mapToObj(j -> db.components().insertSnapshot(project)); }) @@ -257,8 +257,8 @@ public class SnapshotDaoIT { @Test public void selectAnalysesByQuery_by_component_uuid() { Random random = new Random(); - ComponentDto project1 = db.components().insertPrivateProject(); - ComponentDto project2 = db.components().insertPrivateProject(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); List snapshots1 = IntStream.range(0, 1 + random.nextInt(20)) .mapToObj(j -> db.components().insertSnapshot(project1)) .toList(); @@ -279,7 +279,7 @@ public class SnapshotDaoIT { @Test public void selectAnalysesByQuery_sort_by_date() { Random random = new Random(); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); List snapshots = IntStream.range(0, 1 + random.nextInt(20)) .mapToObj(j -> SnapshotTesting.newAnalysis(project).setCreatedAt(1_000L + j)) .collect(toList()); @@ -302,7 +302,7 @@ public class SnapshotDaoIT { @Test public void selectAnalysesByQuery_get_last() { - ComponentDto project1 = db.components().insertPrivateProject(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); db.components().insertSnapshot(project1, t -> t.setLast(false)); SnapshotDto lastSnapshot = db.components().insertSnapshot(project1, t -> t.setLast(true)); db.components().insertSnapshot(project1, t -> t.setLast(false)); @@ -316,7 +316,7 @@ public class SnapshotDaoIT { @Test public void selectAnalysesByQuery_get_last_supports_multiple_last_snapshots() { - ComponentDto project1 = db.components().insertPrivateProject(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); db.components().insertSnapshot(project1, t -> t.setLast(false)); SnapshotDto lastSnapshot1 = db.components().insertSnapshot(project1, t -> t.setLast(true)); SnapshotDto lastSnapshot2 = db.components().insertSnapshot(project1, t -> t.setLast(true)); @@ -329,7 +329,7 @@ public class SnapshotDaoIT { @Test public void selectOldestSnapshot() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); db.getDbClient().snapshotDao().insert(dbSession, newAnalysis(project).setCreatedAt(5L), newAnalysis(project).setCreatedAt(2L), @@ -347,9 +347,9 @@ public class SnapshotDaoIT { public void selectFinishedByComponentUuidsAndFromDates() { long from = 1_500_000_000_000L; long otherFrom = 1_200_000_000_000L; - ComponentDto firstProject = db.components().insertPublicProject(); - ComponentDto secondProject = db.components().insertPublicProject(); - ComponentDto thirdProject = db.components().insertPublicProject(); + ComponentDto firstProject = db.components().insertPublicProject().getMainBranchComponent(); + ComponentDto secondProject = db.components().insertPublicProject().getMainBranchComponent(); + ComponentDto thirdProject = db.components().insertPublicProject().getMainBranchComponent(); SnapshotDto finishedAnalysis = db.components().insertSnapshot(firstProject, s -> s.setStatus(STATUS_PROCESSED).setCreatedAt(from)); insertActivity(firstProject.uuid(), finishedAnalysis, SUCCESS); SnapshotDto otherFinishedAnalysis = db.components().insertSnapshot(firstProject, s -> s.setStatus(STATUS_PROCESSED).setCreatedAt(from + 1_000_000L)); @@ -372,7 +372,7 @@ public class SnapshotDaoIT { @Test public void selectFinishedByComponentUuidsAndFromDates_returns_processed_analysis_even_if_analysis_failed() { long from = 1_500_000_000_000L; - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); SnapshotDto unprocessedAnalysis = db.components().insertSnapshot(project, s -> s.setStatus(STATUS_UNPROCESSED).setCreatedAt(from + 1_000_000L)); insertActivity(project.uuid(), unprocessedAnalysis, CANCELED); SnapshotDto finishedAnalysis = db.components().insertSnapshot(project, s -> s.setStatus(STATUS_PROCESSED).setCreatedAt(from)); @@ -389,7 +389,7 @@ public class SnapshotDaoIT { @Test public void selectFinishedByComponentUuidsAndFromDates_return_branches_analysis() { long from = 1_500_000_000_000L; - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto firstBranch = db.components().insertProjectBranch(project); ComponentDto secondBranch = db.components().insertProjectBranch(project); SnapshotDto finishedAnalysis = db.components().insertSnapshot(firstBranch, s -> s.setStatus(STATUS_PROCESSED).setCreatedAt(from)); @@ -409,7 +409,7 @@ public class SnapshotDaoIT { @Test public void selectSnapshotBefore() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); SnapshotDto analysis1 = newAnalysis(project).setCreatedAt(50L).setPeriodDate(20L); SnapshotDto analysis2 = newAnalysis(project).setCreatedAt(20L).setPeriodDate(10L); SnapshotDto analysis3 = newAnalysis(project).setCreatedAt(10L).setPeriodDate(null); @@ -428,7 +428,7 @@ public class SnapshotDaoIT { @Test public void insert() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); SnapshotDto dto = underTest.insert(db.getSession(), newAnalysis(project) .setStatus("P") @@ -455,7 +455,7 @@ public class SnapshotDaoIT { @Test @UseDataProvider("nullAndEmptyNonEmptyStrings") public void insert_with_null_and_empty_and_non_empty_projectVersion(@Nullable String projectVersion) { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); SnapshotDto dto = underTest.insert(db.getSession(), newAnalysis(project).setProjectVersion(projectVersion)); @@ -465,7 +465,7 @@ public class SnapshotDaoIT { @Test @UseDataProvider("nullAndEmptyNonEmptyStrings") public void insert_with_null_and_empty_and_non_empty_buildString(@Nullable String buildString) { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); SnapshotDto dto = underTest.insert(db.getSession(), newAnalysis(project).setBuildString(buildString)); @@ -483,7 +483,7 @@ public class SnapshotDaoIT { @Test public void insert_snapshots() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); underTest.insert(db.getSession(), newAnalysis(project).setLast(false).setUuid("u5"), diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/duplication/DuplicationDaoIT.java b/server/sonar-db-dao/src/it/java/org/sonar/db/duplication/DuplicationDaoIT.java index 01863e2a177..f69c74cbbd8 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/duplication/DuplicationDaoIT.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/duplication/DuplicationDaoIT.java @@ -49,7 +49,7 @@ public class DuplicationDaoIT { @Test public void selectCandidates_returns_block_from_last_snapshot_only_of_component_with_language_and_if_not_specified_analysis() { - ComponentDto project1 = db.components().insertPrivateProject(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto fooFile = db.components().insertComponent(ComponentTesting.newFileDto(project1).setLanguage("foo").setEnabled(true)); ComponentDto fooFile1 = db.components().insertComponent(ComponentTesting.newFileDto(project1).setLanguage("foo").setEnabled(true)); ComponentDto disabledFooFile = db.components().insertComponent(ComponentTesting.newFileDto(project1).setLanguage("foo").setEnabled(false)); @@ -108,13 +108,13 @@ public class DuplicationDaoIT { @Test public void select_component() { - ComponentDto project1 = db.components().insertPrivateProject(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); SnapshotDto analysis1 = db.components().insertSnapshot(project1); - ComponentDto project2 = db.components().insertPrivateProject(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); SnapshotDto analysis2 = db.components().insertSnapshot(project2); - ComponentDto project3 = db.components().insertPrivateProject(); + ComponentDto project3 = db.components().insertPrivateProject().getMainBranchComponent(); SnapshotDto analysis3 = db.components().insertSnapshot(project3); - ComponentDto project4 = db.components().insertPrivateProject(); + ComponentDto project4 = db.components().insertPrivateProject().getMainBranchComponent(); insert(project1, analysis1, "bb", 0, 0, 0); insert(project2, analysis2, "aa", 0, 1, 2); insert(project3, analysis3, "bb", 0, 0, 0); diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/event/EventDaoIT.java b/server/sonar-db-dao/src/it/java/org/sonar/db/event/EventDaoIT.java index 54c25b4275f..9ef4dacca8c 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/event/EventDaoIT.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/event/EventDaoIT.java @@ -124,7 +124,7 @@ public class EventDaoIT { @Test public void select_by_analysis_uuids() { - ComponentDto project = dbTester.components().insertPrivateProject(); + ComponentDto project = dbTester.components().insertPrivateProject().getMainBranchComponent(); SnapshotDto a1 = dbTester.components().insertSnapshot(newAnalysis(project)); SnapshotDto a2 = dbTester.components().insertSnapshot(newAnalysis(project)); SnapshotDto a42 = dbTester.components().insertSnapshot(newAnalysis(project)); diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/issue/IssueDaoIT.java b/server/sonar-db-dao/src/it/java/org/sonar/db/issue/IssueDaoIT.java index c83cf5a4850..8099aaf130c 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/issue/IssueDaoIT.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/issue/IssueDaoIT.java @@ -216,7 +216,7 @@ public class IssueDaoIT { long updatedAt = 1_340_000_000_000L; long changedSince = 1_000_000_000_000L; - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); RuleDto rule = db.rules().insert(r -> r.setRepositoryKey("java").setLanguage("java")); ComponentDto branchA = db.components().insertProjectBranch(project, b -> b.setKey("branchA")); @@ -284,7 +284,7 @@ public class IssueDaoIT { @Test public void selectOpenByComponentUuid() { RuleDto rule = db.rules().insert(); - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto projectBranch = db.components().insertProjectBranch(project, b -> b.setKey("feature/foo") .setBranchType(BranchType.BRANCH)); @@ -306,7 +306,7 @@ public class IssueDaoIT { @Test public void selectOpenByComponentUuid_should_correctly_map_required_fields() { RuleDto rule = db.rules().insert(); - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto projectBranch = db.components().insertProjectBranch(project, b -> b.setKey("feature/foo") .setBranchType(BranchType.BRANCH)); @@ -334,7 +334,7 @@ public class IssueDaoIT { @Test public void test_selectIssueGroupsByComponent_on_component_without_issues() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(ComponentTesting.newFileDto(project)); Collection groups = underTest.selectIssueGroupsByComponent(db.getSession(), file, 1_000L); @@ -372,7 +372,7 @@ public class IssueDaoIT { @Test public void selectIssueGroupsByComponent_on_file() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(ComponentTesting.newFileDto(project)); RuleDto rule = db.rules().insert(); IssueDto fpBug = db.issues().insert(rule, project, file, @@ -420,7 +420,7 @@ public class IssueDaoIT { @Test public void selectGroupsOfComponentTreeOnLeak_on_file_new_code_reference_branch() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(ComponentTesting.newFileDto(project)); RuleDto rule = db.rules().insert(); IssueDto fpBug = db.issues().insert(rule, project, file, @@ -595,7 +595,7 @@ public class IssueDaoIT { private void prepareIssuesComponent() { db.rules().insert(RULE.setIsExternal(true)); - ComponentDto projectDto = db.components().insertPrivateProject(t -> t.setUuid(PROJECT_UUID).setKey(PROJECT_KEY)); + ComponentDto projectDto = db.components().insertPrivateProject(t -> t.setUuid(PROJECT_UUID).setKey(PROJECT_KEY)).getMainBranchComponent(); db.components().insertComponent(newFileDto(projectDto).setUuid(FILE_UUID).setKey(FILE_KEY)); } diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/issue/IssueMapperIT.java b/server/sonar-db-dao/src/it/java/org/sonar/db/issue/IssueMapperIT.java index aae4b56442e..4a9cb8afe11 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/issue/IssueMapperIT.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/issue/IssueMapperIT.java @@ -71,7 +71,7 @@ public class IssueMapperIT { @Before public void setUp() { - project = dbTester.components().insertPrivateProject(); + project = dbTester.components().insertPrivateProject().getMainBranchComponent(); file = ComponentTesting.newFileDto(project); dbTester.getDbClient().componentDao().insert(dbSession, file, true); file2 = ComponentTesting.newFileDto(project).setUuid("file2 uuid"); @@ -511,7 +511,7 @@ public class IssueMapperIT { } private ComponentDto randomComponent() { - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); ComponentDto dir = dbTester.components().insertComponent(ComponentTesting.newDirectory(project, "foo")); ComponentDto file = dbTester.components().insertComponent(ComponentTesting.newFileDto(project, dir)); ComponentDto[] components = new ComponentDto[] {project, dir, file}; diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/measure/LiveMeasureDaoIT.java b/server/sonar-db-dao/src/it/java/org/sonar/db/measure/LiveMeasureDaoIT.java index e519befcad4..bb52a216671 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/measure/LiveMeasureDaoIT.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/measure/LiveMeasureDaoIT.java @@ -147,8 +147,8 @@ public class LiveMeasureDaoIT { public void selectForProjectsByMetricUuids() { MetricDto metric = db.measures().insertMetric(); MetricDto metric2 = db.measures().insertMetric(); - ComponentDto project = db.components().insertPrivateProject(); - ComponentDto project2 = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); underTest.insert(db.getSession(), newLiveMeasure(project, metric).setValue(3.14).setData((String) null)); underTest.insert(db.getSession(), newLiveMeasure(project, metric2).setValue(4.54).setData((String) null)); underTest.insert(db.getSession(), newLiveMeasure(project2, metric).setValue(99.99).setData((String) null)); @@ -164,7 +164,7 @@ public class LiveMeasureDaoIT { @Test public void selectForProjectsByMetricUuids_whenMetricDoesNotMatch_shouldReturnEmptyList() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); underTest.insert(db.getSession(), newLiveMeasure(project, metric).setValue(3.14).setData((String) null)); List selected = underTest.selectForProjectsByMetricUuids(db.getSession(), singletonList("_other_")); assertThat(selected).isEmpty(); @@ -173,9 +173,9 @@ public class LiveMeasureDaoIT { @Test public void selectForProjectsByMetricUuids_shouldReturnProjectWithTRKQualifierOnly() { MetricDto metric = db.measures().insertMetric(); - ComponentDto application = db.components().insertPrivateApplication(); - ComponentDto project = db.components().insertPrivateProject(); - ComponentDto project2 = db.components().insertPrivateProject(); + ComponentDto application = db.components().insertPrivateApplication().getMainBranchComponent(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); db.components().addApplicationProject(application, project, project2); underTest.insert(db.getSession(), newLiveMeasure(application, metric).setValue(3.14).setData((String) null)); underTest.insert(db.getSession(), newLiveMeasure(project, metric).setValue(4.54).setData((String) null)); @@ -272,7 +272,7 @@ public class LiveMeasureDaoIT { public void selectTreeByQuery() { List results = new ArrayList<>(); MetricDto metric = db.measures().insertMetric(); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); underTest.insert(db.getSession(), newLiveMeasure(file, metric).setValue(3.14)); @@ -294,8 +294,8 @@ public class LiveMeasureDaoIT { List results = new ArrayList<>(); MetricDto metric = db.measures().insertMetric(); MetricDto metric2 = db.measures().insertMetric(); - ComponentDto project = db.components().insertPrivateProject(); - ComponentDto project2 = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); underTest.insert(db.getSession(), newLiveMeasure(project, metric).setValue(3.14)); underTest.insert(db.getSession(), newLiveMeasure(project, metric2).setValue(4.54)); underTest.insert(db.getSession(), newLiveMeasure(project2, metric).setValue(99.99)); @@ -316,7 +316,7 @@ public class LiveMeasureDaoIT { @Test public void scrollSelectByComponentUuidAndMetricKeys_for_empty_metric_set() { List results = new ArrayList<>(); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); underTest.scrollSelectByComponentUuidAndMetricKeys(db.getSession(), project.uuid(), Sets.newSet(), context -> results.add(context.getResultObject())); @@ -336,7 +336,7 @@ public class LiveMeasureDaoIT { @Test public void selectMeasure_map_fields() { MetricDto metric = db.measures().insertMetric(); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); underTest.insert(db.getSession(), newLiveMeasure(file, metric).setValue(3.14).setData("text_value")); @@ -353,15 +353,15 @@ public class LiveMeasureDaoIT { MetricDto ncloc = db.measures().insertMetric(m -> m.setKey("ncloc").setValueType(INT.toString())); MetricDto lines = db.measures().insertMetric(m -> m.setKey("lines").setValueType(INT.toString())); - ComponentDto simpleProject = db.components().insertPublicProject(); + ComponentDto simpleProject = db.components().insertPublicProject().getMainBranchComponent(); db.measures().insertLiveMeasure(simpleProject, ncloc, m -> m.setValue(10d)); - ComponentDto projectWithBiggerBranch = db.components().insertPublicProject(); + ComponentDto projectWithBiggerBranch = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto bigBranch = db.components().insertProjectBranch(projectWithBiggerBranch, b -> b.setBranchType(BranchType.BRANCH)); db.measures().insertLiveMeasure(projectWithBiggerBranch, ncloc, m -> m.setValue(100d)); db.measures().insertLiveMeasure(bigBranch, ncloc, m -> m.setValue(200d)); - ComponentDto projectWithLinesButNoLoc = db.components().insertPublicProject(); + ComponentDto projectWithLinesButNoLoc = db.components().insertPublicProject().getMainBranchComponent(); db.measures().insertLiveMeasure(projectWithLinesButNoLoc, lines, m -> m.setValue(365d)); db.measures().insertLiveMeasure(projectWithLinesButNoLoc, ncloc, m -> m.setValue(0d)); @@ -417,7 +417,7 @@ public class LiveMeasureDaoIT { public void insert_data() { byte[] data = "text_value".getBytes(StandardCharsets.UTF_8); MetricDto metric = db.measures().insertMetric(); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); LiveMeasureDto measure = newLiveMeasure(file, metric).setData(data); @@ -499,8 +499,8 @@ public class LiveMeasureDaoIT { public void countProjectsHavingMeasure() { MetricDto metric1 = db.measures().insertMetric(); MetricDto metric2 = db.measures().insertMetric(); - ComponentDto project1 = db.components().insertPrivateProject(); - ComponentDto project2 = db.components().insertPrivateProject(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); db.measures().insertLiveMeasure(project1, metric1); db.measures().insertLiveMeasure(project2, metric1); db.measures().insertLiveMeasure(project1, metric2); @@ -733,7 +733,7 @@ public class LiveMeasureDaoIT { } private ComponentDto addProjectWithMeasure(String projectKey, MetricDto metric, double metricValue) { - ComponentDto project = db.components().insertPublicProject(p -> p.setKey(projectKey)); + ComponentDto project = db.components().insertPublicProject(p -> p.setKey(projectKey)).getMainBranchComponent(); addMeasureToComponent(project, metric, metricValue, true); return project; } diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/measure/MeasureDaoIT.java b/server/sonar-db-dao/src/it/java/org/sonar/db/measure/MeasureDaoIT.java index 27264295e4c..ede1a896723 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/measure/MeasureDaoIT.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/measure/MeasureDaoIT.java @@ -66,7 +66,7 @@ public class MeasureDaoIT { @Test public void test_selectLastMeasure() { MetricDto metric = db.measures().insertMetric(); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); SnapshotDto lastAnalysis = insertAnalysis(project.uuid(), true); SnapshotDto pastAnalysis = insertAnalysis(project.uuid(), false); @@ -87,7 +87,7 @@ public class MeasureDaoIT { @Test public void test_selectMeasure() { MetricDto metric = db.measures().insertMetric(); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); SnapshotDto lastAnalysis = insertAnalysis(project.uuid(), true); SnapshotDto pastAnalysis = insertAnalysis(project.uuid(), false); @@ -110,14 +110,14 @@ public class MeasureDaoIT { @Test public void test_selects() { - ComponentDto project1 = db.components().insertPrivateProject(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto dir = db.components().insertComponent(newDirectory(project1, "path")); db.components().insertComponent(newFileDto(dir).setUuid("C1")); db.components().insertComponent(newFileDto(dir).setUuid("C2")); SnapshotDto lastAnalysis = insertAnalysis(project1.uuid(), true); SnapshotDto pastAnalysis = insertAnalysis(project1.uuid(), false); - ComponentDto project2 = db.components().insertPrivateProject(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); SnapshotDto project2LastAnalysis = insertAnalysis(project2.uuid(), true); // project 1 @@ -164,7 +164,7 @@ public class MeasureDaoIT { @Test public void select_past_measures_with_several_analyses() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); long lastAnalysisDate = parseDate("2017-01-25").getTime(); long previousAnalysisDate = lastAnalysisDate - 10_000_000_000L; long oldAnalysisDate = lastAnalysisDate - 100_000_000_000L; diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/measure/ProjectMeasuresIndexerIteratorIT.java b/server/sonar-db-dao/src/it/java/org/sonar/db/measure/ProjectMeasuresIndexerIteratorIT.java index f63586e9d6a..a55affffc50 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/measure/ProjectMeasuresIndexerIteratorIT.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/measure/ProjectMeasuresIndexerIteratorIT.java @@ -63,7 +63,7 @@ public class ProjectMeasuresIndexerIteratorIT { public void return_project_measure() { ComponentDto project = dbTester.components().insertPrivateProject( c -> c.setKey("Project-Key").setName("Project Name"), - p -> p.setTags(newArrayList("platform", "java"))); + p -> p.setTags(newArrayList("platform", "java"))).getMainBranchComponent(); SnapshotDto analysis = dbTester.components().insertSnapshot(project); MetricDto metric1 = dbTester.measures().insertMetric(m -> m.setValueType(INT.name()).setKey("ncloc")); @@ -87,7 +87,7 @@ public class ProjectMeasuresIndexerIteratorIT { @Test public void return_application_measure() { - ComponentDto project = dbTester.components().insertPrivateApplication(c -> c.setKey("App-Key").setName("App Name")); + ComponentDto project = dbTester.components().insertPrivateApplication(c -> c.setKey("App-Key").setName("App Name")).getMainBranchComponent(); SnapshotDto analysis = dbTester.components().insertSnapshot(project); MetricDto metric1 = dbTester.measures().insertMetric(m -> m.setValueType(INT.name()).setKey("ncloc")); @@ -111,7 +111,7 @@ public class ProjectMeasuresIndexerIteratorIT { public void return_project_measure_having_leak() { ComponentDto project = dbTester.components().insertPrivateProject( c -> c.setKey("Project-Key").setName("Project Name"), - p -> p.setTagsString("platform,java")); + p -> p.setTagsString("platform,java")).getMainBranchComponent(); MetricDto metric = dbTester.measures().insertMetric(m -> m.setValueType(INT.name()).setKey("new_lines")); dbTester.measures().insertLiveMeasure(project, metric, m -> m.setValue(10d)); @@ -122,9 +122,9 @@ public class ProjectMeasuresIndexerIteratorIT { @Test public void return_quality_gate_status_measure() { - ComponentDto project1 = dbTester.components().insertPrivateProject(); - ComponentDto project2 = dbTester.components().insertPrivateProject(); - ComponentDto project3 = dbTester.components().insertPrivateProject(); + ComponentDto project1 = dbTester.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project2 = dbTester.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project3 = dbTester.components().insertPrivateProject().getMainBranchComponent(); MetricDto metric = dbTester.measures().insertMetric(m -> m.setValueType(LEVEL.name()).setKey("alert_status")); dbTester.measures().insertLiveMeasure(project2, metric, m -> m.setValue(null).setData(OK.name())); dbTester.measures().insertLiveMeasure(project3, metric, m -> m.setValue(null).setData(ERROR.name())); @@ -137,7 +137,7 @@ public class ProjectMeasuresIndexerIteratorIT { @Test public void does_not_fail_when_quality_gate_has_no_value() { - ComponentDto project = dbTester.components().insertPrivateProject(); + ComponentDto project = dbTester.components().insertPrivateProject().getMainBranchComponent(); MetricDto metric = dbTester.measures().insertMetric(m -> m.setValueType(LEVEL.name()).setKey("alert_status")); dbTester.measures().insertLiveMeasure(project, metric, m -> m.setValue(null).setData((String) null)); @@ -148,7 +148,7 @@ public class ProjectMeasuresIndexerIteratorIT { @Test public void return_language_distribution_measure_from_biggest_branch() { - ComponentDto project = dbTester.components().insertPrivateProject(); + ComponentDto project = dbTester.components().insertPrivateProject().getMainBranchComponent(); MetricDto languagesDistributionMetric = dbTester.measures().insertMetric(m -> m.setValueType(DATA.name()).setKey("ncloc_language_distribution")); MetricDto nclocMetric = dbTester.measures().insertMetric(m -> m.setValueType(INT.name()).setKey("ncloc")); @@ -178,7 +178,7 @@ public class ProjectMeasuresIndexerIteratorIT { @Test public void does_not_return_none_numeric_metrics() { - ComponentDto project = dbTester.components().insertPrivateProject(); + ComponentDto project = dbTester.components().insertPrivateProject().getMainBranchComponent(); MetricDto dataMetric = dbTester.measures().insertMetric(m -> m.setValueType(DATA.name()).setKey("data")); MetricDto distribMetric = dbTester.measures().insertMetric(m -> m.setValueType(DISTRIB.name()).setKey("distrib")); MetricDto stringMetric = dbTester.measures().insertMetric(m -> m.setValueType(STRING.name()).setKey("string")); @@ -193,7 +193,7 @@ public class ProjectMeasuresIndexerIteratorIT { @Test public void does_not_return_disabled_metrics() { - ComponentDto project = dbTester.components().insertPrivateProject(); + ComponentDto project = dbTester.components().insertPrivateProject().getMainBranchComponent(); MetricDto disabledMetric = dbTester.measures().insertMetric(m -> m.setValueType(INT.name()).setEnabled(false).setHidden(false).setKey("disabled")); dbTester.measures().insertLiveMeasure(project, disabledMetric, m -> m.setValue(10d)); @@ -207,7 +207,7 @@ public class ProjectMeasuresIndexerIteratorIT { MetricDto metric1 = dbTester.measures().insertMetric(m -> m.setValueType(INT.name()).setKey("coverage")); MetricDto metric2 = dbTester.measures().insertMetric(m -> m.setValueType(INT.name()).setKey("ncloc")); MetricDto leakMetric = dbTester.measures().insertMetric(m -> m.setValueType(INT.name()).setKey("new_lines")); - ComponentDto project = dbTester.components().insertPrivateProject(); + ComponentDto project = dbTester.components().insertPrivateProject().getMainBranchComponent(); dbTester.measures().insertLiveMeasure(project, metric1, m -> m.setValue(10d)); dbTester.measures().insertLiveMeasure(project, leakMetric, m -> m.setValue(20d)); @@ -221,7 +221,7 @@ public class ProjectMeasuresIndexerIteratorIT { public void ignore_numeric_measure_that_has_text_value_but_not_numeric_value() { MetricDto metric1 = dbTester.measures().insertMetric(m -> m.setValueType(INT.name()).setKey("coverage")); MetricDto metric2 = dbTester.measures().insertMetric(m -> m.setValueType(INT.name()).setKey("ncloc")); - ComponentDto project = dbTester.components().insertPrivateProject(); + ComponentDto project = dbTester.components().insertPrivateProject().getMainBranchComponent(); dbTester.measures().insertLiveMeasure(project, metric1, m -> m.setValue(10d).setData((String) null)); dbTester.measures().insertLiveMeasure(project, metric2, m -> m.setValue(null).setData("foo")); @@ -231,9 +231,9 @@ public class ProjectMeasuresIndexerIteratorIT { @Test public void return_many_project_measures() { - ComponentDto project1 = dbTester.components().insertPrivateProject(); - ComponentDto project2 = dbTester.components().insertPrivateProject(); - ComponentDto project3 = dbTester.components().insertPrivateProject(); + ComponentDto project1 = dbTester.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project2 = dbTester.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project3 = dbTester.components().insertPrivateProject().getMainBranchComponent(); dbTester.components().insertSnapshot(project1); dbTester.components().insertSnapshot(project2); dbTester.components().insertSnapshot(project3); @@ -243,7 +243,7 @@ public class ProjectMeasuresIndexerIteratorIT { @Test public void return_project_without_analysis() { - ComponentDto project = dbTester.components().insertPrivateProject(); + ComponentDto project = dbTester.components().insertPrivateProject().getMainBranchComponent(); dbClient.snapshotDao().insert(dbSession, newAnalysis(project).setLast(false)); dbSession.commit(); @@ -256,9 +256,9 @@ public class ProjectMeasuresIndexerIteratorIT { @Test public void return_only_docs_from_given_project() { - ComponentDto project1 = dbTester.components().insertPrivateProject(); - ComponentDto project2 = dbTester.components().insertPrivateProject(); - ComponentDto project3 = dbTester.components().insertPrivateProject(); + ComponentDto project1 = dbTester.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project2 = dbTester.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project3 = dbTester.components().insertPrivateProject().getMainBranchComponent(); SnapshotDto analysis1 = dbTester.components().insertSnapshot(project1); SnapshotDto analysis2 = dbTester.components().insertSnapshot(project2); SnapshotDto analysis3 = dbTester.components().insertSnapshot(project3); @@ -276,7 +276,7 @@ public class ProjectMeasuresIndexerIteratorIT { @Test public void return_nothing_on_unknown_project() { - ComponentDto project = dbTester.components().insertPrivateProject(); + ComponentDto project = dbTester.components().insertPrivateProject().getMainBranchComponent(); dbTester.components().insertSnapshot(project); Map docsById = createResultSetAndReturnDocsById("UNKNOWN"); @@ -286,7 +286,7 @@ public class ProjectMeasuresIndexerIteratorIT { @Test public void non_main_branches_are_not_indexed() { - ComponentDto project = dbTester.components().insertPrivateProject(); + ComponentDto project = dbTester.components().insertPrivateProject().getMainBranchComponent(); MetricDto metric = dbTester.measures().insertMetric(m -> m.setValueType(INT.name()).setKey("ncloc")); dbTester.measures().insertLiveMeasure(project, metric, m -> m.setValue(10d)); diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/newcodeperiod/NewCodePeriodDaoIT.java b/server/sonar-db-dao/src/it/java/org/sonar/db/newcodeperiod/NewCodePeriodDaoIT.java index 67d036a94e3..52c731dbaf0 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/newcodeperiod/NewCodePeriodDaoIT.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/newcodeperiod/NewCodePeriodDaoIT.java @@ -191,7 +191,7 @@ public class NewCodePeriodDaoIT { @Test public void select_branches_referencing() { - ProjectDto project = db.components().insertPrivateProjectDto(); + ProjectDto project = db.components().insertPrivateProject().getProjectDto(); BranchDto mainBranch = db.getDbClient().branchDao().selectByUuid(dbSession, project.getUuid()).get(); BranchDto branch1 = db.components().insertProjectBranch(project); BranchDto branch2 = db.components().insertProjectBranch(project); diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/permission/AuthorizationDaoIT.java b/server/sonar-db-dao/src/it/java/org/sonar/db/permission/AuthorizationDaoIT.java index 311542da461..1aba240a3a2 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/permission/AuthorizationDaoIT.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/permission/AuthorizationDaoIT.java @@ -79,10 +79,10 @@ public class AuthorizationDaoIT { .mapToObj(i -> db.users().insertUser().getUuid()) .collect(MoreCollectors.toSet()); randomPublicProjectUuids = IntStream.range(0, 1 + Math.abs(random.nextInt(5))) - .mapToObj(i -> db.components().insertPublicProject().uuid()) + .mapToObj(i -> db.components().insertPublicProject().getMainBranchComponent().uuid()) .collect(MoreCollectors.toSet()); randomPrivateProjectUuids = IntStream.range(0, 1 + Math.abs(random.nextInt(5))) - .mapToObj(i -> db.components().insertPrivateProject().uuid()) + .mapToObj(i -> db.components().insertPrivateProject().getMainBranchComponent().uuid()) .collect(MoreCollectors.toSet()); } @@ -94,7 +94,7 @@ public class AuthorizationDaoIT { */ @Test public void selectGlobalPermissions_for_logged_in_user() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); db.users().insertMember(group1, user); db.users().insertPermissionOnUser(user, "perm1"); db.users().insertProjectPermissionOnUser(user, "perm42", project); @@ -284,8 +284,8 @@ public class AuthorizationDaoIT { @Test public void keepAuthorizedProjectUuids_returns_public_project_if_user_is_granted_project_permission_directly() { - ComponentDto project = db.components().insertPublicProject(); - ComponentDto otherProject = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); + ComponentDto otherProject = db.components().insertPublicProject().getMainBranchComponent(); UserDto otherUser = db.users().insertUser(); db.users().insertProjectPermissionOnUser(user, randomPermission, project); @@ -301,8 +301,8 @@ public class AuthorizationDaoIT { @Test public void keepAuthorizedProjectUuids_returns_public_project_if_user_is_granted_project_permission_by_group() { - ComponentDto project = db.components().insertPublicProject(); - ComponentDto otherProject = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); + ComponentDto otherProject = db.components().insertPublicProject().getMainBranchComponent(); UserDto otherUser = db.users().insertUser(); db.users().insertMember(group1, user); db.users().insertProjectPermissionOnGroup(group1, randomPermission, project); @@ -319,8 +319,8 @@ public class AuthorizationDaoIT { @Test public void keepAuthorizedProjectUuids_returns_public_project_if_group_AnyOne_is_granted_project_permission_directly() { - ComponentDto project = db.components().insertPublicProject(); - ComponentDto otherProject = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); + ComponentDto otherProject = db.components().insertPublicProject().getMainBranchComponent(); db.users().insertProjectPermissionOnAnyone(randomPermission, project); assertThat(underTest.keepAuthorizedProjectUuids(dbSession, singleton(project.uuid()), null, randomPermission)) @@ -379,8 +379,8 @@ public class AuthorizationDaoIT { @Test public void keepAuthorizedProjectUuids_returns_private_project_if_user_is_granted_project_permission_directly() { - ComponentDto project = db.components().insertPrivateProject(); - ComponentDto otherProject = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto otherProject = db.components().insertPrivateProject().getMainBranchComponent(); UserDto otherUser = db.users().insertUser(); db.users().insertProjectPermissionOnUser(user, randomPermission, project); @@ -396,8 +396,8 @@ public class AuthorizationDaoIT { @Test public void keepAuthorizedProjectUuids_returns_private_project_if_user_is_granted_project_permission_by_group() { - ComponentDto project = db.components().insertPrivateProject(); - ComponentDto otherProject = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto otherProject = db.components().insertPrivateProject().getMainBranchComponent(); UserDto otherUser = db.users().insertUser(); db.users().insertMember(group1, user); db.users().insertProjectPermissionOnGroup(group1, randomPermission, project); @@ -414,9 +414,9 @@ public class AuthorizationDaoIT { @Test public void user_should_be_authorized() { - ComponentDto project1 = db.components().insertPrivateProject(); - ComponentDto project2 = db.components().insertPrivateProject(); - ComponentDto project3 = db.components().insertPrivateProject(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project3 = db.components().insertPrivateProject().getMainBranchComponent(); UserDto user = db.users().insertUser("u1"); GroupDto group = db.users().insertGroup(); db.users().insertProjectPermissionOnUser(user, UserRole.USER, project2); @@ -437,9 +437,9 @@ public class AuthorizationDaoIT { @Test public void group_should_be_authorized() { - ComponentDto project1 = db.components().insertPrivateProject(); - ComponentDto project2 = db.components().insertPrivateProject(); - ComponentDto project3 = db.components().insertPrivateProject(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project3 = db.components().insertPrivateProject().getMainBranchComponent(); UserDto user1 = db.users().insertUser("u1"); GroupDto group = db.users().insertGroup(); db.users().insertMembers(group, user1); @@ -457,8 +457,8 @@ public class AuthorizationDaoIT { @Test public void anonymous_should_be_authorized() { - ComponentDto project1 = db.components().insertPublicProject(); - ComponentDto project2 = db.components().insertPublicProject(); + ComponentDto project1 = db.components().insertPublicProject().getMainBranchComponent(); + ComponentDto project2 = db.components().insertPublicProject().getMainBranchComponent(); UserDto user1 = db.users().insertUser("u1"); GroupDto group = db.users().insertGroup(); db.users().insertMembers(group, user1); @@ -473,7 +473,7 @@ public class AuthorizationDaoIT { @Test public void keepAuthorizedProjectUuids_should_be_able_to_handle_lots_of_projects() { - List projects = IntStream.range(0, 2000).mapToObj(i -> db.components().insertPublicProject()).toList(); + List projects = IntStream.range(0, 2000).mapToObj(i -> db.components().insertPublicProject().getMainBranchComponent()).toList(); Collection uuids = projects.stream().map(ComponentDto::uuid).collect(Collectors.toSet()); assertThat(underTest.keepAuthorizedProjectUuids(dbSession, uuids, null, UserRole.USER)) @@ -482,7 +482,7 @@ public class AuthorizationDaoIT { @Test public void keepAuthorizedUsersForRoleAndProject_returns_empty_if_user_set_is_empty_on_public_project() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); assertThat(underTest.keepAuthorizedUsersForRoleAndProject(dbSession, Collections.emptySet(), UserRole.USER, project.uuid())) .isEmpty(); @@ -490,7 +490,7 @@ public class AuthorizationDaoIT { @Test public void keepAuthorizedUsersForRoleAndProject_returns_empty_for_non_existent_users() { - ComponentDto project = random.nextBoolean() ? db.components().insertPublicProject() : db.components().insertPrivateProject(); + ComponentDto project = random.nextBoolean() ? db.components().insertPublicProject().getMainBranchComponent() : db.components().insertPrivateProject().getMainBranchComponent(); Set randomNonExistingUserUuidsSet = IntStream.range(0, 1 + Math.abs(random.nextInt(5))) .mapToObj(i -> Uuids.createFast()) .collect(MoreCollectors.toSet()); @@ -501,7 +501,7 @@ public class AuthorizationDaoIT { @Test public void keepAuthorizedUsersForRoleAndProject_returns_any_users_for_public_project_without_any_permission_in_DB_and_permission_USER() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); assertThat(underTest.keepAuthorizedUsersForRoleAndProject(dbSession, randomExistingUserUuids, UserRole.USER, project.uuid())) .containsAll(randomExistingUserUuids); @@ -509,7 +509,7 @@ public class AuthorizationDaoIT { @Test public void keepAuthorizedUsersForRoleAndProject_returns_any_users_for_public_project_without_any_permission_in_DB_and_permission_CODEVIEWER() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); assertThat(underTest.keepAuthorizedUsersForRoleAndProject(dbSession, randomExistingUserUuids, UserRole.CODEVIEWER, project.uuid())) .containsAll(randomExistingUserUuids); @@ -517,7 +517,7 @@ public class AuthorizationDaoIT { @Test public void keepAuthorizedUsersForRoleAndProject_returns_empty_for_any_users_on_public_project_without_any_permission_in_DB() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); assertThat(underTest.keepAuthorizedUsersForRoleAndProject(dbSession, randomExistingUserUuids, randomPermission, project.uuid())) .isEmpty(); @@ -525,8 +525,8 @@ public class AuthorizationDaoIT { @Test public void keepAuthorizedUsersForRoleAndProject_returns_user_if_granted_project_permission_directly_on_public_project() { - ComponentDto project = db.components().insertPublicProject(); - ComponentDto otherProject = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); + ComponentDto otherProject = db.components().insertPublicProject().getMainBranchComponent(); UserDto otherUser = db.users().insertUser(); db.users().insertProjectPermissionOnUser(user, randomPermission, project); @@ -542,8 +542,8 @@ public class AuthorizationDaoIT { @Test public void keepAuthorizedUsersForRoleAndProject_returns_user_if_granted_project_permission_by_group_on_public_project() { - ComponentDto project = db.components().insertPublicProject(); - ComponentDto otherProject = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); + ComponentDto otherProject = db.components().insertPublicProject().getMainBranchComponent(); UserDto otherUser = db.users().insertUser(); db.users().insertMember(group1, user); db.users().insertProjectPermissionOnGroup(group1, randomPermission, project); @@ -560,8 +560,8 @@ public class AuthorizationDaoIT { @Test public void keepAuthorizedUsersForRoleAndProject_does_not_return_user_if_granted_project_permission_by_AnyOne_on_public_project() { - ComponentDto project = db.components().insertPublicProject(); - ComponentDto otherProject = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); + ComponentDto otherProject = db.components().insertPublicProject().getMainBranchComponent(); UserDto otherUser = db.users().insertUser(); db.users().insertProjectPermissionOnAnyone(randomPermission, project); @@ -577,7 +577,7 @@ public class AuthorizationDaoIT { @Test public void keepAuthorizedUsersForRoleAndProject_returns_empty_for_any_user_on_private_project_without_any_permission_in_DB_and_permission_USER() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); assertThat(underTest.keepAuthorizedUsersForRoleAndProject(dbSession, randomExistingUserUuids, UserRole.USER, project.uuid())) .isEmpty(); @@ -585,7 +585,7 @@ public class AuthorizationDaoIT { @Test public void keepAuthorizedUsersForRoleAndProject_returns_empty_for_any_user_on_private_project_without_any_permission_in_DB_and_permission_CODEVIEWER() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); assertThat(underTest.keepAuthorizedUsersForRoleAndProject(dbSession, randomExistingUserUuids, UserRole.CODEVIEWER, project.uuid())) .isEmpty(); @@ -593,7 +593,7 @@ public class AuthorizationDaoIT { @Test public void keepAuthorizedUsersForRoleAndProject_returns_empty_for_any_users_and_any_permission_on_private_project_without_any_permission_in_DB() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); PermissionsTestHelper.ALL_PERMISSIONS .forEach(perm -> { @@ -606,8 +606,8 @@ public class AuthorizationDaoIT { @Test public void keepAuthorizedUsersForRoleAndProject_returns_user_if_granted_project_permission_directly_on_private_project() { - ComponentDto project = db.components().insertPrivateProject(); - ComponentDto otherProject = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto otherProject = db.components().insertPublicProject().getMainBranchComponent(); UserDto otherUser = db.users().insertUser(); db.users().insertProjectPermissionOnUser(user, randomPermission, project); @@ -623,8 +623,8 @@ public class AuthorizationDaoIT { @Test public void keepAuthorizedUsersForRoleAndProject_returns_user_if_granted_project_permission_by_group_on_private_project() { - ComponentDto project = db.components().insertPrivateProject(); - ComponentDto otherProject = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto otherProject = db.components().insertPublicProject().getMainBranchComponent(); UserDto otherUser = db.users().insertUser(); db.users().insertMember(group1, user); db.users().insertProjectPermissionOnGroup(group1, randomPermission, project); @@ -641,9 +641,9 @@ public class AuthorizationDaoIT { @Test public void keep_authorized_users_returns_empty_list_for_role_and_project_for_anonymous() { - ComponentDto project1 = db.components().insertPrivateProject(); - ComponentDto project2 = db.components().insertPrivateProject(); - ComponentDto project3 = db.components().insertPrivateProject(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project3 = db.components().insertPrivateProject().getMainBranchComponent(); UserDto user1 = db.users().insertUser("u1"); UserDto user2 = db.users().insertUser("u2"); UserDto user3 = db.users().insertUser("u3"); @@ -722,10 +722,10 @@ public class AuthorizationDaoIT { @Test public void selectProjectPermissionsOfAnonymous_returns_permissions_of_anonymous_user_on_specified_public_project() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); db.users().insertProjectPermissionOnAnyone("p1", project); db.users().insertProjectPermissionOnUser(db.users().insertUser(), "p2", project); - ComponentDto otherProject = db.components().insertPublicProject(); + ComponentDto otherProject = db.components().insertPublicProject().getMainBranchComponent(); db.users().insertProjectPermissionOnAnyone("p3", otherProject); assertThat(underTest.selectProjectPermissionsOfAnonymous(dbSession, project.uuid())).containsOnly("p1"); @@ -743,7 +743,7 @@ public class AuthorizationDaoIT { @Test public void selectProjectPermissions_returns_permissions_of_logged_in_user_on_specified_public_project_through_anonymous_permissions() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); db.users().insertProjectPermissionOnAnyone("p1", project); db.users().insertProjectPermissionOnAnyone("p2", project); @@ -752,7 +752,7 @@ public class AuthorizationDaoIT { @Test public void selectProjectPermissions_returns_permissions_of_logged_in_user_on_specified_project() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); db.users().insertProjectPermissionOnUser(user, UserRole.CODEVIEWER, project); db.users().insertProjectPermissionOnUser(db.users().insertUser(), UserRole.ISSUE_ADMIN, project); @@ -761,7 +761,7 @@ public class AuthorizationDaoIT { @Test public void selectProjectPermissions_returns_permissions_of_logged_in_user_on_specified_project_through_group_membership() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); db.users().insertProjectPermissionOnGroup(group1, UserRole.CODEVIEWER, project); db.users().insertProjectPermissionOnGroup(group2, UserRole.ISSUE_ADMIN, project); db.users().insertMember(group1, user); @@ -771,7 +771,7 @@ public class AuthorizationDaoIT { @Test public void selectProjectPermissions_returns_permissions_of_logged_in_user_on_specified_private_project_through_all_possible_configurations() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); db.users().insertProjectPermissionOnUser(user, UserRole.CODEVIEWER, project); db.users().insertProjectPermissionOnGroup(group1, UserRole.USER, project); db.users().insertMember(group1, user); @@ -781,7 +781,7 @@ public class AuthorizationDaoIT { @Test public void selectProjectPermissions_returns_permissions_of_logged_in_user_on_specified_public_project_through_all_possible_configurations() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); db.users().insertProjectPermissionOnUser(user, "p1", project); db.users().insertProjectPermissionOnAnyone("p2", project); db.users().insertProjectPermissionOnGroup(group1, "p3", project); @@ -792,8 +792,8 @@ public class AuthorizationDaoIT { @Test public void keepAuthorizedProjectUuids_filters_projects_authorized_to_logged_in_user_by_direct_permission() { - ComponentDto privateProject = db.components().insertPrivateProject(); - ComponentDto publicProject = db.components().insertPublicProject(); + ComponentDto privateProject = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto publicProject = db.components().insertPublicProject().getMainBranchComponent(); UserDto user = db.users().insertUser(); db.users().insertProjectPermissionOnUser(user, UserRole.ADMIN, privateProject); @@ -806,8 +806,8 @@ public class AuthorizationDaoIT { @Test public void keepAuthorizedProjectUuids_filters_projects_authorized_to_logged_in_user_by_group_permission() { - ComponentDto privateProject = db.components().insertPrivateProject(); - ComponentDto publicProject = db.components().insertPublicProject(); + ComponentDto privateProject = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto publicProject = db.components().insertPublicProject().getMainBranchComponent(); UserDto user = db.users().insertUser(); GroupDto group = db.users().insertGroup(); db.users().insertMember(group, user); @@ -822,7 +822,7 @@ public class AuthorizationDaoIT { @Test public void keepAuthorizedProjectUuids_returns_empty_list_if_input_is_empty() { - ComponentDto publicProject = db.components().insertPublicProject(); + ComponentDto publicProject = db.components().insertPublicProject().getMainBranchComponent(); UserDto user = db.users().insertUser(); assertThat(underTest.keepAuthorizedProjectUuids(dbSession, Collections.emptySet(), user.getUuid(), UserRole.USER)) @@ -835,7 +835,7 @@ public class AuthorizationDaoIT { @Test public void keepAuthorizedProjectUuids_returns_empty_list_if_input_does_not_reference_existing_projects() { - ComponentDto publicProject = db.components().insertPublicProject(); + ComponentDto publicProject = db.components().insertPublicProject().getMainBranchComponent(); UserDto user = db.users().insertUser(); assertThat(underTest.keepAuthorizedProjectUuids(dbSession, newHashSet("does_not_exist"), user.getUuid(), UserRole.USER)) @@ -844,7 +844,7 @@ public class AuthorizationDaoIT { @Test public void keepAuthorizedProjectUuids_returns_public_projects_if_permission_USER_or_CODEVIEWER() { - ComponentDto publicProject = db.components().insertPublicProject(); + ComponentDto publicProject = db.components().insertPublicProject().getMainBranchComponent(); UserDto user = db.users().insertUser(); // logged-in user @@ -964,7 +964,7 @@ public class AuthorizationDaoIT { UserDto user4 = db.users().insertUser(withEmail("user4")); db.users().insertMember(administratorGroup3, user4); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); // user5 is only project level administer UserDto user5 = db.users().insertUser(withEmail("user5")); @@ -1015,7 +1015,7 @@ public class AuthorizationDaoIT { @Test public void keepAuthorizedLoginsOnProject_return_correct_users_on_public_project() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); UserDto user1 = db.users().insertUser(); @@ -1039,7 +1039,7 @@ public class AuthorizationDaoIT { @Test public void keepAuthorizedLoginsOnProject_return_correct_users_on_private_project() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); GroupDto userGroup = db.users().insertGroup("USERS"); GroupDto adminGroup = db.users().insertGroup("ADMIN"); @@ -1081,7 +1081,7 @@ public class AuthorizationDaoIT { @Test public void keepAuthorizedLoginsOnProject_return_correct_users_on_branch() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto branch = db.components().insertProjectBranch(project, c -> c.setBranchType(BranchType.BRANCH)); GroupDto userGroup = db.users().insertGroup("USERS"); diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/permission/GroupPermissionDaoIT.java b/server/sonar-db-dao/src/it/java/org/sonar/db/permission/GroupPermissionDaoIT.java index 2063a054bf0..9c2aa8cc6f9 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/permission/GroupPermissionDaoIT.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/permission/GroupPermissionDaoIT.java @@ -60,9 +60,9 @@ public class GroupPermissionDaoIT { GroupDto group1 = db.users().insertGroup(); GroupDto group2 = db.users().insertGroup(); GroupDto group3 = db.users().insertGroup(); - ComponentDto project1 = db.components().insertPrivateProject(); - ComponentDto project2 = db.components().insertPrivateProject(); - ComponentDto project3 = db.components().insertPrivateProject(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project3 = db.components().insertPrivateProject().getMainBranchComponent(); db.users().insertProjectPermissionOnGroup(group1, UserRole.ISSUE_ADMIN, project1); db.users().insertProjectPermissionOnGroup(group1, UserRole.ADMIN, project2); @@ -86,9 +86,9 @@ public class GroupPermissionDaoIT { GroupDto group1 = db.users().insertGroup(); GroupDto group2 = db.users().insertGroup(); GroupDto group3 = db.users().insertGroup(); - ComponentDto project1 = db.components().insertPublicProject(); - ComponentDto project2 = db.components().insertPublicProject(); - ComponentDto project3 = db.components().insertPublicProject(); + ComponentDto project1 = db.components().insertPublicProject().getMainBranchComponent(); + ComponentDto project2 = db.components().insertPublicProject().getMainBranchComponent(); + ComponentDto project3 = db.components().insertPublicProject().getMainBranchComponent(); db.users().insertProjectPermissionOnGroup(group1, "p1", project1); db.users().insertProjectPermissionOnGroup(group1, "p2", project2); @@ -123,7 +123,7 @@ public class GroupPermissionDaoIT { @Test public void selectGroupNamesByQuery_is_ordered_by_permissions_then_by_group_when_many_groups_for_global_permissions() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); IntStream.rangeClosed(1, DEFAULT_PAGE_SIZE + 1).forEach(i -> { GroupDto group = db.users().insertGroup("Group-" + i); // Add permission on project to be sure projects are excluded @@ -144,7 +144,7 @@ public class GroupPermissionDaoIT { // Add global permission to be sure they are excluded db.users().insertPermissionOnGroup(group, GlobalPermission.SCAN.getKey()); }); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); String lastGroupName = "Group-" + (DEFAULT_PAGE_SIZE + 1); db.users().insertProjectPermissionOnGroup(db.users().selectGroup(lastGroupName).get(), GlobalPermission.SCAN.getKey(), project); @@ -181,7 +181,7 @@ public class GroupPermissionDaoIT { GroupDto group2 = db.users().insertGroup("Group-2"); GroupDto group3 = db.users().insertGroup("Group-3"); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); db.users().insertPermissionOnAnyone(GlobalPermission.SCAN); db.users().insertPermissionOnAnyone(GlobalPermission.PROVISION_PROJECTS); @@ -205,8 +205,8 @@ public class GroupPermissionDaoIT { GroupDto group2 = db.users().insertGroup(); GroupDto group3 = db.users().insertGroup(); - ComponentDto project = db.components().insertPublicProject(); - ComponentDto anotherProject = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); + ComponentDto anotherProject = db.components().insertPublicProject().getMainBranchComponent(); db.users().insertProjectPermissionOnGroup(group1, "p1", project); db.users().insertProjectPermissionOnGroup(group1, "p2", project); @@ -233,8 +233,8 @@ public class GroupPermissionDaoIT { GroupDto group2 = db.users().insertGroup(); GroupDto group3 = db.users().insertGroup(); - ComponentDto project = db.components().insertPrivateProject(); - ComponentDto anotherProject = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto anotherProject = db.components().insertPrivateProject().getMainBranchComponent(); db.users().insertProjectPermissionOnGroup(group1, GlobalPermission.SCAN.getKey(), project); db.users().insertProjectPermissionOnGroup(group1, GlobalPermission.PROVISION_PROJECTS.getKey(), project); @@ -288,7 +288,7 @@ public class GroupPermissionDaoIT { db.users().insertPermissionOnGroup(group1, GlobalPermission.SCAN); GroupDto group2 = db.users().insertGroup("Group-2"); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); db.users().insertProjectPermissionOnGroup(group2, UserRole.ADMIN, project); GroupDto group3 = db.users().insertGroup("Group-3"); @@ -325,7 +325,7 @@ public class GroupPermissionDaoIT { db.users().insertPermissionOnGroup(group1, "p1"); GroupDto group2 = db.users().insertGroup("Group-2"); - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); db.users().insertProjectPermissionOnGroup(group2, "p2", project); GroupDto group3 = db.users().insertGroup("Group-3"); @@ -361,7 +361,7 @@ public class GroupPermissionDaoIT { db.users().insertPermissionOnGroup(group1, GlobalPermission.PROVISION_PROJECTS); GroupDto group2 = db.users().insertGroup("Group-2"); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); db.users().insertProjectPermissionOnGroup(group2, UserRole.USER, project); GroupDto group3 = db.users().insertGroup("Group-3"); @@ -393,7 +393,7 @@ public class GroupPermissionDaoIT { public void selectGlobalPermissionsOfGroup() { GroupDto group1 = db.users().insertGroup("group1"); GroupDto group2 = db.users().insertGroup("group2"); - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); db.users().insertPermissionOnAnyone("perm1"); db.users().insertPermissionOnGroup(group1, "perm2"); @@ -410,8 +410,8 @@ public class GroupPermissionDaoIT { @Test public void selectProjectPermissionsOfGroup_on_public_project() { GroupDto group1 = db.users().insertGroup("group1"); - ComponentDto project1 = db.components().insertPublicProject(); - ComponentDto project2 = db.components().insertPublicProject(); + ComponentDto project1 = db.components().insertPublicProject().getMainBranchComponent(); + ComponentDto project2 = db.components().insertPublicProject().getMainBranchComponent(); db.users().insertPermissionOnAnyone("perm1"); db.users().insertPermissionOnGroup(group1, "perm2"); @@ -432,8 +432,8 @@ public class GroupPermissionDaoIT { @Test public void selectProjectKeysWithAnyonePermissions_on_public_project_none_found() { - ComponentDto project1 = db.components().insertPublicProject(); - ComponentDto project2 = db.components().insertPublicProject(); + ComponentDto project1 = db.components().insertPublicProject().getMainBranchComponent(); + ComponentDto project2 = db.components().insertPublicProject().getMainBranchComponent(); GroupDto group = db.users().insertGroup(); db.users().insertProjectPermissionOnGroup(group, "perm1", project1); db.users().insertProjectPermissionOnGroup(group, "perm1", project2); @@ -442,9 +442,9 @@ public class GroupPermissionDaoIT { @Test public void selectProjectKeysWithAnyonePermissions_on_public_project_ordered_by_kee() { - ComponentDto project1 = db.components().insertPublicProject(); - ComponentDto project2 = db.components().insertPublicProject(); - ComponentDto project3 = db.components().insertPublicProject(); + ComponentDto project1 = db.components().insertPublicProject().getMainBranchComponent(); + ComponentDto project2 = db.components().insertPublicProject().getMainBranchComponent(); + ComponentDto project3 = db.components().insertPublicProject().getMainBranchComponent(); db.users().insertProjectPermissionOnAnyone("perm1", project1); db.users().insertProjectPermissionOnAnyone("perm1", project2); db.users().insertProjectPermissionOnAnyone("perm1", project3); @@ -455,7 +455,7 @@ public class GroupPermissionDaoIT { @Test public void selectProjectKeysWithAnyonePermissions_on_public_project_ordered_by_kee_max_5() { IntStream.rangeClosed(1, 9).forEach(i -> { - ComponentDto project = db.components().insertPublicProject(p -> p.setKey("key-" + i)); + ComponentDto project = db.components().insertPublicProject(p -> p.setKey("key-" + i)).getMainBranchComponent(); db.users().insertProjectPermissionOnAnyone("perm-" + i, project); }); @@ -469,7 +469,7 @@ public class GroupPermissionDaoIT { db.users().insertPermissionOnAnyone("perm-anyone"); IntStream.rangeClosed(1, 9).forEach(i -> { - ComponentDto project = db.components().insertPublicProject(p -> p.setKey("key-" + i)); + ComponentDto project = db.components().insertPublicProject(p -> p.setKey("key-" + i)).getMainBranchComponent(); db.users().insertProjectPermissionOnAnyone("perm-" + i, project); }); @@ -481,7 +481,7 @@ public class GroupPermissionDaoIT { public void countProjectsWithAnyonePermissions() { GroupDto group = db.users().insertGroup(); IntStream.rangeClosed(1, 5).forEach(i -> { - ComponentDto project = db.components().insertPublicProject(p -> p.setKey("key-" + i)); + ComponentDto project = db.components().insertPublicProject(p -> p.setKey("key-" + i)).getMainBranchComponent(); db.users().insertProjectPermissionOnAnyone("perm-" + i, project); db.users().insertProjectPermissionOnGroup(group, "perm-", project); }); @@ -492,8 +492,8 @@ public class GroupPermissionDaoIT { @Test public void selectProjectPermissionsOfGroup_on_private_project() { GroupDto group1 = db.users().insertGroup("group1"); - ComponentDto project1 = db.components().insertPrivateProject(); - ComponentDto project2 = db.components().insertPrivateProject(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); db.users().insertPermissionOnAnyone("perm1"); db.users().insertPermissionOnGroup(group1, "perm2"); @@ -514,8 +514,8 @@ public class GroupPermissionDaoIT { @Test public void selectAllPermissionsByGroupUuid_on_public_project() { GroupDto group1 = db.users().insertGroup("group1"); - ComponentDto project1 = db.components().insertPublicProject(); - ComponentDto project2 = db.components().insertPublicProject(); + ComponentDto project1 = db.components().insertPublicProject().getMainBranchComponent(); + ComponentDto project2 = db.components().insertPublicProject().getMainBranchComponent(); db.users().insertPermissionOnAnyone("perm1"); db.users().insertPermissionOnGroup(group1, "perm2"); db.users().insertProjectPermissionOnGroup(group1, "perm3", project1); @@ -533,8 +533,8 @@ public class GroupPermissionDaoIT { @Test public void selectAllPermissionsByGroupUuid_on_private_project() { GroupDto group1 = db.users().insertGroup("group1"); - ComponentDto project1 = db.components().insertPrivateProject(); - ComponentDto project2 = db.components().insertPrivateProject(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); db.users().insertPermissionOnAnyone("perm1"); db.users().insertPermissionOnGroup(group1, "perm2"); db.users().insertProjectPermissionOnGroup(group1, "perm3", project1); @@ -576,7 +576,7 @@ public class GroupPermissionDaoIT { @Test public void selectGroupUuidsWithPermissionOnProjectBut_does_not_returns_group_AnyOne_of_project_when_it_does_not_have_permission() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); GroupDto group1 = db.users().insertGroup(); GroupDto group2 = db.users().insertGroup(); db.users().insertProjectPermissionOnGroup(group1, "p1", project); @@ -608,8 +608,8 @@ public class GroupPermissionDaoIT { public void deleteByRootComponentUuid_on_private_project() { GroupDto group1 = db.users().insertGroup(); GroupDto group2 = db.users().insertGroup(); - ComponentDto project1 = db.components().insertPrivateProject(); - ComponentDto project2 = db.components().insertPrivateProject(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); db.users().insertPermissionOnGroup(group1, "perm1"); db.users().insertProjectPermissionOnGroup(group1, "perm2", project1); db.users().insertProjectPermissionOnGroup(group2, "perm3", project2); @@ -625,8 +625,8 @@ public class GroupPermissionDaoIT { public void deleteByRootComponentUuid_on_public_project() { GroupDto group1 = db.users().insertGroup(); GroupDto group2 = db.users().insertGroup(); - ComponentDto project1 = db.components().insertPublicProject(); - ComponentDto project2 = db.components().insertPublicProject(); + ComponentDto project1 = db.components().insertPublicProject().getMainBranchComponent(); + ComponentDto project2 = db.components().insertPublicProject().getMainBranchComponent(); db.users().insertPermissionOnGroup(group1, "perm1"); db.users().insertProjectPermissionOnGroup(group1, "perm2", project1); db.users().insertProjectPermissionOnGroup(group2, "perm3", project2); @@ -643,7 +643,7 @@ public class GroupPermissionDaoIT { @Test public void delete_global_permission_from_group_on_public_project() { GroupDto group1 = db.users().insertGroup(); - ComponentDto project1 = db.components().insertPublicProject(); + ComponentDto project1 = db.components().insertPublicProject().getMainBranchComponent(); db.users().insertPermissionOnAnyone("perm1"); db.users().insertPermissionOnGroup(group1, "perm2"); db.users().insertProjectPermissionOnGroup(group1, "perm3", project1); @@ -659,7 +659,7 @@ public class GroupPermissionDaoIT { @Test public void delete_global_permission_from_group_on_private_project() { GroupDto group1 = db.users().insertGroup(); - ComponentDto project1 = db.components().insertPrivateProject(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); db.users().insertPermissionOnAnyone("perm1"); db.users().insertPermissionOnGroup(group1, "perm2"); db.users().insertProjectPermissionOnGroup(group1, "perm3", project1); @@ -674,7 +674,7 @@ public class GroupPermissionDaoIT { @Test public void delete_global_permission_from_anyone_on_public_project() { GroupDto group1 = db.users().insertGroup(); - ComponentDto project1 = db.components().insertPublicProject(); + ComponentDto project1 = db.components().insertPublicProject().getMainBranchComponent(); db.users().insertPermissionOnAnyone("perm1"); db.users().insertPermissionOnGroup(group1, "perm2"); db.users().insertProjectPermissionOnGroup(group1, "perm3", project1); @@ -690,7 +690,7 @@ public class GroupPermissionDaoIT { @Test public void delete_project_permission_from_group_on_private_project() { GroupDto group1 = db.users().insertGroup(); - ComponentDto project1 = db.components().insertPrivateProject(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); db.users().insertPermissionOnAnyone("perm1"); db.users().insertPermissionOnGroup(group1, "perm2"); db.users().insertProjectPermissionOnGroup(group1, "perm3", project1); @@ -705,7 +705,7 @@ public class GroupPermissionDaoIT { @Test public void delete_project_permission_from_group_on_public_project() { GroupDto group1 = db.users().insertGroup(); - ComponentDto project1 = db.components().insertPublicProject(); + ComponentDto project1 = db.components().insertPublicProject().getMainBranchComponent(); db.users().insertPermissionOnAnyone("perm1"); db.users().insertPermissionOnGroup(group1, "perm2"); db.users().insertProjectPermissionOnGroup(group1, "perm3", project1); @@ -721,7 +721,7 @@ public class GroupPermissionDaoIT { @Test public void delete_project_permission_from_anybody_on_private_project() { GroupDto group1 = db.users().insertGroup(); - ComponentDto project1 = db.components().insertPublicProject(); + ComponentDto project1 = db.components().insertPublicProject().getMainBranchComponent(); db.users().insertPermissionOnAnyone("perm1"); db.users().insertPermissionOnGroup(group1, "perm2"); db.users().insertProjectPermissionOnGroup(group1, "perm3", project1); @@ -736,7 +736,7 @@ public class GroupPermissionDaoIT { @Test public void deleteByRootComponentUuidAndGroupUuid_deletes_all_permissions_of_group_AnyOne_of_specified_component_if_groupUuid_is_null() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); GroupDto group = db.users().insertGroup(); db.users().insertProjectPermissionOnAnyone("p1", project); db.users().insertProjectPermissionOnGroup(group, "p2", project); @@ -766,7 +766,7 @@ public class GroupPermissionDaoIT { @Test public void deleteByRootComponentUuidAndGroupUuid_deletes_all_permissions_of_specified_group_of_specified_component_if_groupUuid_is_non_null() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); GroupDto group1 = db.users().insertGroup(); GroupDto group2 = db.users().insertGroup(); db.users().insertProjectPermissionOnAnyone("p1", project); @@ -845,7 +845,7 @@ public class GroupPermissionDaoIT { @Test public void deleteByRootComponentUuidAndGroupUuid_has_no_effect_if_component_has_no_group_permission_for_group_AnyOne() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); GroupDto group1 = db.users().insertGroup(); db.users().insertProjectPermissionOnGroup(group1, "p1", project); assertThat(underTest.selectProjectPermissionsOfGroup(dbSession, null, project.uuid())) @@ -870,7 +870,7 @@ public class GroupPermissionDaoIT { @Test public void deleteByRootComponentUuidAndGroupUuid_has_no_effect_if_component_has_no_group_permission_for_specified_group() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); GroupDto group1 = db.users().insertGroup(); GroupDto group2 = db.users().insertGroup(); db.users().insertProjectPermissionOnGroup(group1, "p1", project); @@ -892,7 +892,7 @@ public class GroupPermissionDaoIT { @Test public void deleteByRootComponentUuidAndPermission_deletes_all_rows_for_specified_role_of_specified_component() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); GroupDto group = db.users().insertGroup(); Stream.of("p1", "p2").forEach(permission -> { db.users().insertPermissionOnAnyone(permission); @@ -939,7 +939,7 @@ public class GroupPermissionDaoIT { @Test public void deleteByRootComponentUuidAndPermission_has_no_effect_if_component_does_not_exist() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); GroupDto group = db.users().insertGroup(); db.users().insertPermissionOnAnyone("p1"); db.users().insertPermissionOnGroup(group, "p1"); @@ -992,7 +992,7 @@ public class GroupPermissionDaoIT { } private ComponentDto randomPublicOrPrivateProject() { - return new Random().nextBoolean() ? db.components().insertPublicProject() : db.components().insertPrivateProject(); + return new Random().nextBoolean() ? db.components().insertPublicProject().getMainBranchComponent() : db.components().insertPrivateProject().getMainBranchComponent(); } private PermissionQuery.Builder newQuery() { diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/permission/GroupPermissionDaoWithPersisterIT.java b/server/sonar-db-dao/src/it/java/org/sonar/db/permission/GroupPermissionDaoWithPersisterIT.java index beeb8c3bce7..4aab749b8a4 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/permission/GroupPermissionDaoWithPersisterIT.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/permission/GroupPermissionDaoWithPersisterIT.java @@ -99,7 +99,7 @@ public class GroupPermissionDaoWithPersisterIT { @Test public void groupProjectPermissionDeleteByComponentWithoutAffectedRowsIsNotPersisted() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); underTest.deleteByRootComponentUuid(dbSession, project); @@ -127,7 +127,7 @@ public class GroupPermissionDaoWithPersisterIT { @Test public void groupProjectPermissionDeleteByComponentAndGroupWithoutAffectedRowsIsNotPersisted() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); underTest.deleteByRootComponentUuidForAnyOne(dbSession, project); @@ -156,7 +156,7 @@ public class GroupPermissionDaoWithPersisterIT { @Test public void groupProjectPermissionDeleteByComponentAndPermissionWithoutAffectedRowsIsNotPersisted() { GroupDto group = db.users().insertGroup(); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); GroupPermissionDto dto = getGroupPermission(group, project); underTest.deleteByRootComponentUuidAndPermission(dbSession, dto.getRole(), project); @@ -173,13 +173,13 @@ public class GroupPermissionDaoWithPersisterIT { private void addGroupPermission() { group = db.users().insertGroup(g -> g.setUuid("guuid").setName("gname")); - project = db.components().insertPrivateProject(c -> c.setUuid("cuuid").setName("cname").setKey("cKey")); + project = db.components().insertPrivateProject(c -> c.setUuid("cuuid").setName("cname").setKey("cKey")).getMainBranchComponent(); dto = getGroupPermission(group, project); underTest.insert(dbSession, dto, project, null); } private void addGroupPermissionWithoutGroup() { - project = db.components().insertPrivateProject(c -> c.setUuid("cuuid").setName("cname").setKey("cKey")); + project = db.components().insertPrivateProject(c -> c.setUuid("cuuid").setName("cname").setKey("cKey")).getMainBranchComponent(); dto = getGroupPermission(project); underTest.insert(dbSession, dto, project, null); } diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/permission/UserPermissionDaoIT.java b/server/sonar-db-dao/src/it/java/org/sonar/db/permission/UserPermissionDaoIT.java index 49d04dd3292..a10632b1ff1 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/permission/UserPermissionDaoIT.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/permission/UserPermissionDaoIT.java @@ -60,7 +60,7 @@ public class UserPermissionDaoIT { UserDto user1 = insertUser(u -> u.setLogin("login1").setName("Marius").setEmail("email1@email.com")); UserDto user2 = insertUser(u -> u.setLogin("login2").setName("Marie").setEmail("email2@email.com")); UserDto user3 = insertUser(u -> u.setLogin("zanother").setName("Zoe").setEmail("zanother3@another.com")); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); UserPermissionDto global1 = addGlobalPermission(GlobalPermission.ADMINISTER.getKey(), user1); UserPermissionDto global2 = addGlobalPermission(GlobalPermission.ADMINISTER.getKey(), user2); UserPermissionDto global3 = addGlobalPermission(GlobalPermission.PROVISION_PROJECTS.getKey(), user2); @@ -111,8 +111,8 @@ public class UserPermissionDaoIT { UserDto user2 = insertUser(u -> u.setLogin("login2").setName("Marie").setEmail("email2@email.com")); UserDto user3 = insertUser(u -> u.setLogin("zanother").setName("Zoe").setEmail("zanother3@another.com")); addGlobalPermission(GlobalPermission.ADMINISTER.getKey(), user1); - ComponentDto project1 = db.components().insertPrivateProject(); - ComponentDto project2 = db.components().insertPrivateProject(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); UserPermissionDto perm1 = addProjectPermission(UserRole.USER, user1, project1); UserPermissionDto perm2 = addProjectPermission(UserRole.ISSUE_ADMIN, user1, project1); UserPermissionDto perm3 = addProjectPermission(UserRole.ISSUE_ADMIN, user2, project1); @@ -160,7 +160,7 @@ public class UserPermissionDaoIT { @Test public void selectUserUuidsByQuery_is_ordering_by_users_having_permissions_first_then_by_name_lowercase_when_high_number_of_users_for_global_permissions() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); IntStream.rangeClosed(1, DEFAULT_PAGE_SIZE + 1).forEach(i -> { UserDto user = insertUser(u -> u.setLogin("login" + i).setName("" + i)); // Add permission on project to be sure projects are excluded @@ -186,7 +186,7 @@ public class UserPermissionDaoIT { }); String lastLogin = "login" + (DEFAULT_PAGE_SIZE + 1); UserDto lastUser = db.getDbClient().userDao().selectByLogin(dbSession, lastLogin); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); db.users().insertProjectPermissionOnUser(lastUser, GlobalPermission.SCAN.getKey(), project); PermissionQuery query = PermissionQuery.builder() @@ -203,7 +203,7 @@ public class UserPermissionDaoIT { UserDto user1 = insertUser(u -> u.setLogin("login1").setName("Z").setEmail("email1@email.com")); UserDto user2 = insertUser(u -> u.setLogin("login2").setName("A").setEmail("email2@email.com")); addGlobalPermission(GlobalPermission.ADMINISTER.getKey(), user1); - ComponentDto project1 = db.components().insertPrivateProject(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); addProjectPermission(UserRole.USER, user2, project1); addProjectPermission(UserRole.USER, user1, project1); addProjectPermission(UserRole.ADMIN, user1, project1); @@ -219,8 +219,8 @@ public class UserPermissionDaoIT { public void countUsersByProjectPermission() { UserDto user1 = insertUser(); UserDto user2 = insertUser(); - ComponentDto project1 = db.components().insertPrivateProject(); - ComponentDto project2 = db.components().insertPrivateProject(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); addGlobalPermission(GlobalPermission.ADMINISTER.getKey(), user1); addProjectPermission(UserRole.USER, user1, project1); addProjectPermission(UserRole.ISSUE_ADMIN, user1, project1); @@ -246,8 +246,8 @@ public class UserPermissionDaoIT { public void selectUserUuidsByQuery() { UserDto user1 = insertUser(u -> u.setLogin("login1").setName("Marius").setEmail("email1@email.com")); UserDto user2 = insertUser(u -> u.setLogin("login2").setName("Marie").setEmail("email2@email.com")); - ComponentDto project1 = db.components().insertPrivateProject(); - ComponentDto project2 = db.components().insertPrivateProject(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); addProjectPermission(UserRole.USER, user1, project1); addProjectPermission(UserRole.USER, user2, project1); addProjectPermission(UserRole.ISSUE_ADMIN, user2, project1); @@ -279,8 +279,8 @@ public class UserPermissionDaoIT { public void selectUserUuidsByQueryAndScope_with_global_scope() { UserDto user1 = insertUser(u -> u.setLogin("login1").setName("Marius").setEmail("email1@email.com")); UserDto user2 = insertUser(u -> u.setLogin("login2").setName("Marie").setEmail("email2@email.com")); - ComponentDto project1 = db.components().insertPrivateProject(); - ComponentDto project2 = db.components().insertPrivateProject(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); addProjectPermission(UserRole.USER, user1, project1); addGlobalPermission(GlobalPermission.PROVISION_PROJECTS.getKey(), user1); addProjectPermission(UserRole.ISSUE_ADMIN, user2, project2); @@ -296,8 +296,8 @@ public class UserPermissionDaoIT { public void selectUserUuidsByQueryAndScope_with_project_scope() { UserDto user1 = insertUser(u -> u.setLogin("login1").setName("Marius").setEmail("email1@email.com")); UserDto user2 = insertUser(u -> u.setLogin("login2").setName("Marie").setEmail("email2@email.com")); - ComponentDto project1 = db.components().insertPrivateProject(); - ComponentDto project2 = db.components().insertPrivateProject(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); addProjectPermission(UserRole.USER, user1, project1); addGlobalPermission(GlobalPermission.PROVISION_PROJECTS.getKey(), user1); addProjectPermission(UserRole.ISSUE_ADMIN, user2, project2); @@ -350,8 +350,8 @@ public class UserPermissionDaoIT { public void deleteGlobalPermission() { UserDto user1 = insertUser(); UserDto user2 = insertUser(); - ComponentDto project1 = db.components().insertPrivateProject(); - ComponentDto project2 = db.components().insertPrivateProject(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); addGlobalPermission("perm1", user1); addGlobalPermission("perm2", user1); addProjectPermission("perm1", user1, project1); @@ -381,8 +381,8 @@ public class UserPermissionDaoIT { public void deleteProjectPermission() { UserDto user1 = insertUser(); UserDto user2 = insertUser(); - ComponentDto project1 = db.components().insertPrivateProject(); - ComponentDto project2 = db.components().insertPrivateProject(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); addGlobalPermission("perm", user1); addProjectPermission("perm", user1, project1); addProjectPermission("perm", user1, project2); @@ -401,8 +401,8 @@ public class UserPermissionDaoIT { public void deleteProjectPermissions() { UserDto user1 = insertUser(); UserDto user2 = insertUser(); - ComponentDto project1 = db.components().insertPrivateProject(); - ComponentDto project2 = db.components().insertPrivateProject(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); addGlobalPermission("perm", user1); addProjectPermission("perm", user1, project1); addProjectPermission("perm", user2, project1); @@ -418,7 +418,7 @@ public class UserPermissionDaoIT { UserDto user1 = insertUser(); UserDto user2 = insertUser(); UserDto user3 = insertUser(); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); addGlobalPermission("perm1", user1); addGlobalPermission("perm2", user2); addGlobalPermission("perm3", user1); @@ -435,9 +435,9 @@ public class UserPermissionDaoIT { public void selectProjectPermissionsOfUser() { UserDto user1 = insertUser(); UserDto user2 = insertUser(); - ComponentDto project1 = db.components().insertPrivateProject(); - ComponentDto project2 = db.components().insertPrivateProject(); - ComponentDto project3 = db.components().insertPrivateProject(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project3 = db.components().insertPrivateProject().getMainBranchComponent(); addGlobalPermission("perm1", user1); addProjectPermission("perm2", user1, project1); addProjectPermission("perm3", user1, project1); @@ -498,7 +498,7 @@ public class UserPermissionDaoIT { public void deleteByUserId() { UserDto user1 = insertUser(); UserDto user2 = insertUser(); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); db.users().insertGlobalPermissionOnUser(user1, GlobalPermission.SCAN); db.users().insertGlobalPermissionOnUser(user1, GlobalPermission.ADMINISTER); db.users().insertProjectPermissionOnUser(user1, GlobalPermission.ADMINISTER_QUALITY_GATES.getKey(), project); @@ -587,7 +587,7 @@ public class UserPermissionDaoIT { } private ComponentDto randomPublicOrPrivateProject() { - return new Random().nextBoolean() ? db.components().insertPrivateProject() : db.components().insertPublicProject(); + return new Random().nextBoolean() ? db.components().insertPrivateProject().getMainBranchComponent() : db.components().insertPublicProject().getMainBranchComponent(); } private UserDto insertUser(Consumer populateUserDto) { diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/permission/UserPermissionDaoWithPersisterIT.java b/server/sonar-db-dao/src/it/java/org/sonar/db/permission/UserPermissionDaoWithPersisterIT.java index f44eecfc994..dd819c63f44 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/permission/UserPermissionDaoWithPersisterIT.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/permission/UserPermissionDaoWithPersisterIT.java @@ -95,7 +95,7 @@ public class UserPermissionDaoWithPersisterIT { @Test public void userProjectPermissionInsertAndDeleteArePersisted() { UserDto user = insertUser(u -> u.setLogin("login1").setName("Marius").setEmail("email1@email.com")); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); UserPermissionDto dto = new UserPermissionDto(Uuids.create(), ADMINISTER.getKey(), user.getUuid(), project.uuid()); underTest.insert(dbSession, dto, project, user, null); @@ -117,7 +117,7 @@ public class UserPermissionDaoWithPersisterIT { @Test public void userProjectPermissionDeleteWithoutAffectedRowsIsNotPersisted() { UserDto user = insertUser(u -> u.setLogin("login1").setName("Marius").setEmail("email1@email.com")); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); underTest.deleteProjectPermission(dbSession, user, ADMINISTER.getKey(), project); @@ -143,7 +143,7 @@ public class UserPermissionDaoWithPersisterIT { @Test public void userApplicationPermissionIsPersisted() { UserDto user = insertUser(u -> u.setLogin("login1").setName("Marius").setEmail("email1@email.com")); - ComponentDto application = db.components().insertPublicApplication(); + ComponentDto application = db.components().insertPublicApplication().getMainBranchComponent(); UserPermissionDto dto = new UserPermissionDto(Uuids.create(), ADMINISTER.getKey(), user.getUuid(), application.uuid()); underTest.insert(dbSession, dto, application, user, null); @@ -157,7 +157,7 @@ public class UserPermissionDaoWithPersisterIT { @Test public void deleteUserPermissionOfAnyUserIsPersisted() { UserDto user = insertUser(u -> u.setLogin("login1").setName("Marius").setEmail("email1@email.com")); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); UserPermissionDto dto = new UserPermissionDto(Uuids.create(), SCAN.getKey(), user.getUuid(), project.uuid()); underTest.insert(dbSession, dto, project, user, null); underTest.deleteProjectPermissionOfAnyUser(dbSession, SCAN.getKey(), project); @@ -171,7 +171,7 @@ public class UserPermissionDaoWithPersisterIT { @Test public void deleteUserPermissionOfAnyUserWithoutAffectedRowsIsNotPersisted() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); underTest.deleteProjectPermissionOfAnyUser(dbSession, SCAN.getKey(), project); @@ -182,7 +182,7 @@ public class UserPermissionDaoWithPersisterIT { @Test public void deleteUserPermissionByUserUuidIsPersisted() { UserDto user = insertUser(u -> u.setLogin("login1").setName("Marius").setEmail("email1@email.com")); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); UserPermissionDto dto = new UserPermissionDto(Uuids.create(), ADMINISTER.getKey(), user.getUuid(), project.uuid()); underTest.insert(dbSession, dto, project, user, null); underTest.deleteByUserUuid(dbSession, user); diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/portfolio/PortfolioDaoIT.java b/server/sonar-db-dao/src/it/java/org/sonar/db/portfolio/PortfolioDaoIT.java index f56ffabb3af..e89907dd86b 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/portfolio/PortfolioDaoIT.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/portfolio/PortfolioDaoIT.java @@ -156,8 +156,8 @@ public class PortfolioDaoIT { @Test public void delete() { - ProjectDto proj1 = db.components().insertPrivateProjectDto("proj1"); - ProjectDto app1 = db.components().insertPrivateApplicationDto(); + ProjectDto proj1 = db.components().insertPrivateProject("proj1").getProjectDto(); + ProjectDto app1 = db.components().insertPrivateApplication().getProjectDto(); PortfolioDto p1 = db.components().insertPrivatePortfolioDto("p1"); PortfolioDto p2 = db.components().insertPrivatePortfolioDto("p2"); @@ -224,7 +224,7 @@ public class PortfolioDaoIT { db.components().insertPrivatePortfolioDto("portfolio1"); db.components().insertPrivatePortfolioDto("portfolio2"); db.components().insertPrivatePortfolioDto("portfolio3"); - ProjectDto app1 = db.components().insertPrivateApplicationDto(p -> p.setKey("app1")); + ProjectDto app1 = db.components().insertPrivateApplication(p -> p.setKey("app1")).getProjectDto(); portfolioDao.addReference(session, "portfolio1", "portfolio2"); portfolioDao.addReference(session, "portfolio2", "portfolio3"); @@ -240,7 +240,7 @@ public class PortfolioDaoIT { db.components().insertPrivatePortfolioDto("portfolio1"); db.components().insertPrivatePortfolioDto("portfolio2"); db.components().insertPrivatePortfolioDto("portfolio3"); - ProjectDto app1 = db.components().insertPrivateApplicationDto(p -> p.setKey("app1")); + ProjectDto app1 = db.components().insertPrivateApplication(p -> p.setKey("app1")).getProjectDto(); portfolioDao.addReference(session, "portfolio1", "portfolio2"); portfolioDao.addReference(session, "portfolio2", "portfolio3"); @@ -259,9 +259,9 @@ public class PortfolioDaoIT { var p1 = db.components().insertPrivatePortfolioDto("portfolio1"); var p2 = db.components().insertPrivatePortfolioDto("portfolio2", p -> p.setRootUuid(p1.getUuid()).setParentUuid(p1.getUuid())); var p3 = db.components().insertPrivatePortfolioDto("portfolio3", p -> p.setRootUuid(p1.getUuid()).setParentUuid(p1.getUuid())); - ProjectDto app1 = db.components().insertPrivateApplicationDto(p -> p.setKey("app1")); - ProjectDto app2 = db.components().insertPrivateApplicationDto(p -> p.setKey("app2")); - ProjectDto app3 = db.components().insertPrivateApplicationDto(p -> p.setKey("app3")); + ProjectDto app1 = db.components().insertPrivateApplication(p -> p.setKey("app1")).getProjectDto(); + ProjectDto app2 = db.components().insertPrivateApplication(p -> p.setKey("app2")).getProjectDto(); + ProjectDto app3 = db.components().insertPrivateApplication(p -> p.setKey("app3")).getProjectDto(); portfolioDao.addReference(session, "portfolio1", app1.getUuid()); portfolioDao.addReference(session, "portfolio2", app2.getUuid()); @@ -282,9 +282,9 @@ public class PortfolioDaoIT { var p1 = db.components().insertPrivatePortfolioDto("portfolio1"); var p2 = db.components().insertPrivatePortfolioDto("portfolio2", p -> p.setRootUuid(p1.getUuid()).setParentUuid(p1.getUuid())); var p3 = db.components().insertPrivatePortfolioDto("portfolio3", p -> p.setRootUuid(p1.getUuid()).setParentUuid(p1.getUuid())); - ProjectDto app1 = db.components().insertPrivateApplicationDto(p -> p.setKey("app1")); - ProjectDto app2 = db.components().insertPrivateApplicationDto(p -> p.setKey("app2")); - ProjectDto app3 = db.components().insertPrivateApplicationDto(p -> p.setKey("app3")); + ProjectDto app1 = db.components().insertPrivateApplication(p -> p.setKey("app1")).getProjectDto(); + ProjectDto app2 = db.components().insertPrivateApplication(p -> p.setKey("app2")).getProjectDto(); + ProjectDto app3 = db.components().insertPrivateApplication(p -> p.setKey("app3")).getProjectDto(); portfolioDao.addReference(session, "portfolio1", app1.getUuid()); portfolioDao.addReference(session, "portfolio2", app2.getUuid()); @@ -316,10 +316,10 @@ public class PortfolioDaoIT { @Test public void selectAllApplicationProjectsBelongToTheSamePortfolio() { var portfolio = db.components().insertPrivatePortfolioDto("portfolio1"); - var app1 = db.components().insertPrivateApplicationDto(p -> p.setKey("app1")); - var app2 = db.components().insertPrivateApplicationDto(p -> p.setKey("app2")); - var project1 = db.components().insertPrivateProjectDto(p -> p.setKey("project:one").setName("Projet Un")); - var project2 = db.components().insertPrivateProjectDto(p -> p.setKey("project:two").setName("Projet Deux")); + var app1 = db.components().insertPrivateApplication(p -> p.setKey("app1")).getProjectDto(); + var app2 = db.components().insertPrivateApplication(p -> p.setKey("app2")).getProjectDto(); + var project1 = db.components().insertPrivateProject(p -> p.setKey("project:one").setName("Projet Un")).getProjectDto(); + var project2 = db.components().insertPrivateProject(p -> p.setKey("project:two").setName("Projet Deux")).getProjectDto(); db.components().addApplicationProject(app1, project1); db.components().addApplicationProject(app2, project2); @@ -353,7 +353,7 @@ public class PortfolioDaoIT { @Test public void select_reference_to_app_by_key() { PortfolioDto portfolio = db.components().insertPrivatePortfolioDto("portfolio1"); - ProjectDto app1 = db.components().insertPrivateApplicationDto(p -> p.setKey("app1")); + ProjectDto app1 = db.components().insertPrivateApplication(p -> p.setKey("app1")).getProjectDto(); db.components().addPortfolioReference(portfolio, app1.getUuid()); assertThat(portfolioDao.selectReferenceToApp(db.getSession(), portfolio.getUuid(), app1.getKey())) @@ -371,7 +371,7 @@ public class PortfolioDaoIT { @Test public void select_reference_to_app_with_branches() { PortfolioDto portfolio = db.components().insertPrivatePortfolioDto("portfolio1"); - ProjectDto app = db.components().insertPrivateApplicationDto(p -> p.setKey("app").setName("app")); + ProjectDto app = db.components().insertPrivateApplication(p -> p.setKey("app").setName("app")).getProjectDto(); BranchDto branch1 = db.components().insertProjectBranch(app, b -> b.setExcludeFromPurge(true)); BranchDto branch2 = db.components().insertProjectBranch(app, b -> b.setExcludeFromPurge(true)); @@ -391,7 +391,7 @@ public class PortfolioDaoIT { @Test public void select_root_reference_to_app_main_branch() { PortfolioDto portfolio1 = db.components().insertPrivatePortfolioDto("portfolio1"); - ProjectDto app1 = db.components().insertPrivateApplicationDto(p -> p.setKey("app1")); + ProjectDto app1 = db.components().insertPrivateApplication(p -> p.setKey("app1")).getProjectDto(); db.components().addPortfolioReference(portfolio1, app1.getUuid()); assertThat(portfolioDao.selectRootOfReferencersToMainBranch(db.getSession(), app1.getUuid())) @@ -399,7 +399,7 @@ public class PortfolioDaoIT { .containsExactly(portfolio1.getKey()); PortfolioDto portfolio2 = db.components().insertPrivatePortfolioDto("portfolio2"); - ProjectDto app2 = db.components().insertPrivateApplicationDto(p -> p.setKey("app2")); + ProjectDto app2 = db.components().insertPrivateApplication(p -> p.setKey("app2")).getProjectDto(); db.components().addPortfolioApplicationBranch(portfolio2.getUuid(), app2.getUuid(), app2.getUuid()); assertThat(portfolioDao.selectRootOfReferencersToMainBranch(db.getSession(), app2.getUuid())) @@ -410,7 +410,7 @@ public class PortfolioDaoIT { @Test public void select_root_reference_to_app_with_branches() { PortfolioDto portfolio = db.components().insertPrivatePortfolioDto("portfolio1"); - ProjectDto app = db.components().insertPrivateApplicationDto(p -> p.setKey("app").setName("app")); + ProjectDto app = db.components().insertPrivateApplication(p -> p.setKey("app").setName("app")).getProjectDto(); BranchDto branch = db.components().insertProjectBranch(app, b -> b.setExcludeFromPurge(true)); db.components().addPortfolioApplicationBranch(portfolio.getUuid(), app.getUuid(), branch.getUuid()); @@ -443,7 +443,7 @@ public class PortfolioDaoIT { PortfolioDto portfolio1 = db.components().insertPrivatePortfolioDto("portfolio1"); PortfolioDto portfolio2 = db.components().insertPrivatePortfolioDto("portfolio2"); - ProjectDto app1 = db.components().insertPrivateApplicationDto(c -> c.setUuid("app1")); + ProjectDto app1 = db.components().insertPrivateApplication(c -> c.setUuid("app1")).getProjectDto(); portfolioDao.addReference(session, "portfolio1", "portfolio2"); portfolioDao.addReference(session, "portfolio1", app1.getUuid()); portfolioDao.addReference(session, "portfolio2", app1.getUuid()); @@ -530,7 +530,7 @@ public class PortfolioDaoIT { @Test public void deleteReferenceBranch() { PortfolioDto portfolio = db.components().insertPrivatePortfolioDto("portfolio1"); - ProjectDto app = db.components().insertPrivateApplicationDto(p -> p.setKey("app").setName("app")); + ProjectDto app = db.components().insertPrivateApplication(p -> p.setKey("app").setName("app")).getProjectDto(); BranchDto branch1 = db.components().insertProjectBranch(app, b -> b.setExcludeFromPurge(true)); BranchDto branch2 = db.components().insertProjectBranch(app, b -> b.setExcludeFromPurge(true)); @@ -558,8 +558,8 @@ public class PortfolioDaoIT { PortfolioDto portfolio2 = db.components().insertPublicPortfolioDto(); PortfolioDto portfolio3 = db.components().insertPublicPortfolioDto(); - ProjectDto project1 = db.components().insertPrivateProjectDto("project1"); - ProjectDto project2 = db.components().insertPrivateProjectDto("project2"); + ProjectDto project1 = db.components().insertPrivateProject("project1").getProjectDto(); + ProjectDto project2 = db.components().insertPrivateProject("project2").getProjectDto(); assertThat(portfolioDao.selectPortfolioProjects(session, portfolio1.getUuid())).isEmpty(); db.components().addPortfolioProject(portfolio1, project1); @@ -581,8 +581,8 @@ public class PortfolioDaoIT { db.components().insertPrivatePortfolioDto("portfolio1"); db.components().insertPrivatePortfolioDto("portfolio2"); - db.components().insertPrivateProjectDto("project1"); - db.components().insertPrivateProjectDto("project2"); + db.components().insertPrivateProject("project1").getProjectDto(); + db.components().insertPrivateProject("project2").getProjectDto(); assertThat(portfolioDao.selectPortfolioProjects(session, "portfolio1")).isEmpty(); String uuid = portfolioDao.addProject(session, "portfolio1", "project1"); @@ -605,8 +605,8 @@ public class PortfolioDaoIT { public void deleteProject_deletes_selected_branches() { db.components().insertPrivatePortfolioDto("portfolio1"); - db.components().insertPrivateProjectDto("project1"); - db.components().insertPrivateProjectDto("project2"); + db.components().insertPrivateProject("project1").getProjectDto(); + db.components().insertPrivateProject("project2").getProjectDto(); String uuid1 = portfolioDao.addProject(session, "portfolio1", "project1"); portfolioDao.addBranch(session, uuid1, "project1Branch"); @@ -624,7 +624,7 @@ public class PortfolioDaoIT { @Test public void add_and_delete_selected_branches() { PortfolioDto portfolio1 = db.components().insertPrivatePortfolioDto("portfolio1"); - ProjectDto project1 = db.components().insertPrivateProjectDto("project1"); + ProjectDto project1 = db.components().insertPrivateProject("project1").getProjectDto(); db.components().addPortfolioProject(portfolio1, project1); assertThat(db.countRowsOfTable(db.getSession(), "portfolio_proj_branches")).isZero(); @@ -649,10 +649,10 @@ public class PortfolioDaoIT { @Test public void selectAllProjectsInHierarchy() { - ProjectDto p1 = db.components().insertPrivateProjectDto("p1"); - ProjectDto p2 = db.components().insertPrivateProjectDto("p2"); - ProjectDto p3 = db.components().insertPrivateProjectDto("p3"); - ProjectDto p4 = db.components().insertPrivateProjectDto("p4"); + ProjectDto p1 = db.components().insertPrivateProject("p1").getProjectDto(); + ProjectDto p2 = db.components().insertPrivateProject("p2").getProjectDto(); + ProjectDto p3 = db.components().insertPrivateProject("p3").getProjectDto(); + ProjectDto p4 = db.components().insertPrivateProject("p4").getProjectDto(); PortfolioDto root = db.components().insertPrivatePortfolioDto("root"); PortfolioDto child1 = addPortfolio(root, "child1"); @@ -675,10 +675,10 @@ public class PortfolioDaoIT { @Test public void deleteAllProjects() { - db.components().insertPrivateProjectDto("p1"); - db.components().insertPrivateProject("p2"); - db.components().insertPrivateProject("p3"); - db.components().insertPrivateProject("p4"); + db.components().insertPrivateProject("p1").getProjectDto(); + db.components().insertPrivateProject("p2").getMainBranchComponent(); + db.components().insertPrivateProject("p3").getMainBranchComponent(); + db.components().insertPrivateProject("p4").getMainBranchComponent(); PortfolioDto root = db.components().insertPrivatePortfolioDto(); PortfolioDto child1 = addPortfolio(root); diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/project/ProjectDaoIT.java b/server/sonar-db-dao/src/it/java/org/sonar/db/project/ProjectDaoIT.java index 7f673703b61..5e57fc83960 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/project/ProjectDaoIT.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/project/ProjectDaoIT.java @@ -138,8 +138,8 @@ public class ProjectDaoIT { var applications = new ArrayList(); for (int i = 0; i < 1500; i++) { - ProjectDto project = db.components().insertPrivateProjectDto(); - ProjectDto app = db.components().insertPrivateApplicationDto(); + ProjectDto project = db.components().insertPrivateProject().getProjectDto(); + ProjectDto app = db.components().insertPrivateApplication().getProjectDto(); db.components().addApplicationProject(app, project); applications.add(i, app); } @@ -291,7 +291,7 @@ public class ProjectDaoIT { @Test public void update_ncloc_should_update_project() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); projectDao.updateNcloc(db.getSession(), project.uuid(), 10L); @@ -300,25 +300,25 @@ public class ProjectDaoIT { @Test public void getNcloc_sum_compute_correctly_sum_of_projects() { - projectDao.updateNcloc(db.getSession(), db.components().insertPublicProject().uuid(), 1L); - projectDao.updateNcloc(db.getSession(), db.components().insertPublicProject().uuid(), 20L); - projectDao.updateNcloc(db.getSession(), db.components().insertPublicProject().uuid(), 100L); + projectDao.updateNcloc(db.getSession(), db.components().insertPublicProject().getMainBranchComponent().uuid(), 1L); + projectDao.updateNcloc(db.getSession(), db.components().insertPublicProject().getMainBranchComponent().uuid(), 20L); + projectDao.updateNcloc(db.getSession(), db.components().insertPublicProject().getMainBranchComponent().uuid(), 100L); Assertions.assertThat(projectDao.getNclocSum(db.getSession())).isEqualTo(121L); } @Test public void getNcloc_sum_compute_correctly_sum_of_projects_while_excluding_project() { - projectDao.updateNcloc(db.getSession(), db.components().insertPublicProject().uuid(), 1L); - projectDao.updateNcloc(db.getSession(), db.components().insertPublicProject().uuid(), 20L); - ComponentDto project3 = db.components().insertPublicProject(); + projectDao.updateNcloc(db.getSession(), db.components().insertPublicProject().getMainBranchComponent().uuid(), 1L); + projectDao.updateNcloc(db.getSession(), db.components().insertPublicProject().getMainBranchComponent().uuid(), 20L); + ComponentDto project3 = db.components().insertPublicProject().getMainBranchComponent(); projectDao.updateNcloc(db.getSession(), project3.uuid(), 100L); Assertions.assertThat(projectDao.getNclocSum(db.getSession(), project3.uuid())).isEqualTo(21L); } @Test public void selectAllProjectUuids_shouldOnlyReturnProjectWithTRKQualifier() { - ComponentDto application = db.components().insertPrivateApplication(); - ComponentDto project = db.components().insertPrivateProject(); - ComponentDto project2 = db.components().insertPrivateProject(); + ComponentDto application = db.components().insertPrivateApplication().getMainBranchComponent(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); db.components().addApplicationProject(application, project, project2); List projectUuids = projectDao.selectAllProjectUuids(db.getSession()); @@ -341,7 +341,7 @@ public class ProjectDaoIT { private Set insertProjects(int number) { return IntStream .rangeClosed(0, number) - .mapToObj(x -> db.components().insertPrivateProject()) + .mapToObj(x -> db.components().insertPrivateProject().getMainBranchComponent()) .collect(Collectors.toSet()); } diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/property/PropertiesDaoIT.java b/server/sonar-db-dao/src/it/java/org/sonar/db/property/PropertiesDaoIT.java index 92c40330142..881318d6f86 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/property/PropertiesDaoIT.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/property/PropertiesDaoIT.java @@ -141,7 +141,7 @@ public class PropertiesDaoIT { String projectUuid = randomAlphabetic(8); String projectKey = randomAlphabetic(4); String projectName = randomAlphabetic(4); - db.components().insertPrivateProject(projectUuid); + db.components().insertPrivateProject(projectUuid).getMainBranchComponent(); // global subscription insertProperty("notification.DispatcherWithGlobalSubscribers.Email", "true", null, @@ -615,8 +615,8 @@ public class PropertiesDaoIT { @Test public void select_component_properties_by_ids() { - ComponentDto project = db.components().insertPrivateProject(); - ComponentDto project2 = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); UserDto user = db.users().insertUser(); String key = "key"; @@ -644,8 +644,8 @@ public class PropertiesDaoIT { @Test public void select_properties_by_keys_and_component_ids() { - ComponentDto project = db.components().insertPrivateProject(); - ComponentDto project2 = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); UserDto user = db.users().insertUser(); String key = "key"; @@ -675,8 +675,8 @@ public class PropertiesDaoIT { @Test public void select_by_key_and_matching_value() { - ComponentDto project1 = db.components().insertPrivateProject(); - ComponentDto project2 = db.components().insertPrivateProject(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); db.properties().insertProperties(null, project1.getKey(), project1.name(), project1.qualifier(), newComponentPropertyDto("key", "value", project1)); db.properties().insertProperties(null, project2.getKey(), project2.name(), project2.qualifier(), newComponentPropertyDto("key", "value", project2)); db.properties().insertProperties(null, null, null, null, newGlobalPropertyDto("key", "value")); @@ -694,9 +694,9 @@ public class PropertiesDaoIT { public void selectByKeyAndUserUuidAndComponentQualifier() { UserDto user1 = db.users().insertUser(); UserDto user2 = db.users().insertUser(); - ComponentDto project1 = db.components().insertPrivateProject(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file1 = db.components().insertComponent(ComponentTesting.newFileDto(project1)); - ComponentDto project2 = db.components().insertPrivateProject(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); db.properties().insertProperties(user1.getLogin(), project1.getKey(), project1.name(), project1.qualifier(), newPropertyDto("key", "1", project1, user1)); db.properties().insertProperties(user1.getLogin(), project1.getKey(), project2.name(), project2.qualifier(), @@ -1057,8 +1057,8 @@ public class PropertiesDaoIT { @Test public void delete_by_user() { - ComponentDto project = db.components().insertPrivateProject(); - ComponentDto anotherProject = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto anotherProject = db.components().insertPrivateProject().getMainBranchComponent(); UserDto user = db.users().insertUser(); UserDto anotherUser = db.users().insertUser(); insertProperty("KEY_11", "VALUE", project.uuid(), user.getUuid(), user.getLogin(), project.getKey(), project.name()); @@ -1077,8 +1077,8 @@ public class PropertiesDaoIT { @Test public void delete_by_matching_login() { - ComponentDto project = db.components().insertPrivateProject(); - ComponentDto anotherProject = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto anotherProject = db.components().insertPrivateProject().getMainBranchComponent(); UserDto user = db.users().insertUser(); UserDto anotherUser = db.users().insertUser(); insertProperty("KEY_11", user.getLogin(), project.uuid(), null, null, project.getKey(), project.name()); @@ -1097,8 +1097,8 @@ public class PropertiesDaoIT { @Test public void delete_by_key_and_value() { - ComponentDto project = db.components().insertPrivateProject(); - ComponentDto anotherProject = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto anotherProject = db.components().insertPrivateProject().getMainBranchComponent(); insertProperty("KEY", "VALUE", null, null, null, null, null); insertProperty("KEY", "VALUE", project.uuid(), null, null, project.getKey(), project.name()); insertProperty("KEY", "VALUE", null, "100", "login", null, null); @@ -1295,7 +1295,7 @@ public class PropertiesDaoIT { } private ComponentDto insertPrivateProject(String projectKey) { - return db.components().insertPrivateProject(t -> t.setKey(projectKey)); + return db.components().insertPrivateProject(t -> t.setKey(projectKey)).getMainBranchComponent(); } private static Consumer withEmail(String login) { diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/property/PropertiesDaoWithPersisterIT.java b/server/sonar-db-dao/src/it/java/org/sonar/db/property/PropertiesDaoWithPersisterIT.java index 9f053f4bd57..6cc2b4a4e3b 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/property/PropertiesDaoWithPersisterIT.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/property/PropertiesDaoWithPersisterIT.java @@ -432,7 +432,7 @@ public class PropertiesDaoWithPersisterIT { when(auditPersister.isTrackedProperty(ANOTHER_KEY)).thenReturn(false); when(auditPersister.isTrackedProperty(SECURED_KEY)).thenReturn(true); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); UserDto user = db.users().insertUser(); if (value == null) { diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/purge/PurgeCommandsIT.java b/server/sonar-db-dao/src/it/java/org/sonar/db/purge/PurgeCommandsIT.java index 17fd4cc182d..1de9381e774 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/purge/PurgeCommandsIT.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/purge/PurgeCommandsIT.java @@ -99,7 +99,7 @@ public class PurgeCommandsIT { @Test public void purgeAnalyses_deletes_duplications() { - ComponentDto project = dbTester.components().insertPrivateProject(); + ComponentDto project = dbTester.components().insertPrivateProject().getMainBranchComponent(); SnapshotDto analysis1 = dbTester.components().insertSnapshot(project); SnapshotDto analysis2 = dbTester.components().insertSnapshot(project); SnapshotDto analysis3 = dbTester.components().insertSnapshot(project); @@ -135,7 +135,7 @@ public class PurgeCommandsIT { @UseDataProvider("projects") public void deleteComponents_delete_tree_of_components_of_a_project(ComponentDto project) { dbTester.components().insertComponent(project); - ComponentDto otherProject = dbTester.components().insertPrivateProject(); + ComponentDto otherProject = dbTester.components().insertPrivateProject().getMainBranchComponent(); Stream.of(project, otherProject).forEach(prj -> { ComponentDto directory1 = dbTester.components().insertComponent(ComponentTesting.newDirectory(prj, "a")); ComponentDto directory2 = dbTester.components().insertComponent(ComponentTesting.newDirectory(prj, "b")); @@ -183,8 +183,8 @@ public class PurgeCommandsIT { ComponentDto otherView = dbTester.components().insertPrivatePortfolio(); Stream.of(view, otherView).forEach(vw -> { dbTester.components().insertSubView(vw); - dbTester.components().insertComponent(newProjectCopy(dbTester.components().insertPrivateProject(), vw)); - dbTester.components().insertComponent(newProjectCopy(dbTester.components().insertPrivateProject(), vw)); + dbTester.components().insertComponent(newProjectCopy(dbTester.components().insertPrivateProject().getMainBranchComponent(), vw)); + dbTester.components().insertComponent(newProjectCopy(dbTester.components().insertPrivateProject().getMainBranchComponent(), vw)); }); underTest.deleteComponents(view.uuid()); @@ -194,7 +194,7 @@ public class PurgeCommandsIT { @Test public void deleteComponents_does_not_delete_child_tables() { - ComponentDto component = dbTester.components().insertPrivateProject(); + ComponentDto component = dbTester.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = dbTester.components().insertComponent(newFileDto(component)); SnapshotDto analysis = dbTester.components().insertSnapshot(component); dbTester.events().insertEvent(analysis); @@ -212,7 +212,7 @@ public class PurgeCommandsIT { @Test public void deleteProjects() { - ComponentDto project = dbTester.components().insertPrivateProject(); + ComponentDto project = dbTester.components().insertPrivateProject().getMainBranchComponent(); ProjectDto projectDto = dbTester.getDbClient().projectDao().selectProjectByKey(dbTester.getSession(), project.getKey()).get(); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); SnapshotDto analysis = dbTester.components().insertSnapshot(project); @@ -237,7 +237,7 @@ public class PurgeCommandsIT { @UseDataProvider("projectsAndViews") public void deleteAnalyses_by_rootUuid_all_analyses_of_specified_root_uuid(ComponentDto projectOrView) { dbTester.components().insertComponent(projectOrView); - ComponentDto otherProject = dbTester.components().insertPrivateProject(); + ComponentDto otherProject = dbTester.components().insertPrivateProject().getMainBranchComponent(); Stream.of(projectOrView, otherProject).forEach(p -> { dbTester.components().insertSnapshot(p, t -> t.setLast(false)); dbTester.components().insertSnapshot(p, t -> t.setLast(true)); @@ -255,7 +255,7 @@ public class PurgeCommandsIT { @UseDataProvider("projectsAndViews") public void deleteAnalyses_by_rootUuid_deletes_event_component_changes(ComponentDto projectOrView) { dbTester.components().insertComponent(projectOrView); - ComponentDto otherProject = dbTester.components().insertPrivateProject(); + ComponentDto otherProject = dbTester.components().insertPrivateProject().getMainBranchComponent(); int count = 5; IntStream.range(0, count).forEach(i -> { insertRandomEventComponentChange(projectOrView); @@ -274,7 +274,7 @@ public class PurgeCommandsIT { dbTester.components().insertComponent(projectOrView); SnapshotDto analysis1 = dbTester.components().insertSnapshot(projectOrView); SnapshotDto analysis2 = dbTester.components().insertSnapshot(projectOrView); - ComponentDto otherProject = dbTester.components().insertPrivateProject(); + ComponentDto otherProject = dbTester.components().insertPrivateProject().getMainBranchComponent(); SnapshotDto otherAnalysis1 = dbTester.components().insertSnapshot(otherProject); SnapshotDto otherAnalysis2 = dbTester.components().insertSnapshot(otherProject); int count = 7; @@ -301,7 +301,7 @@ public class PurgeCommandsIT { dbTester.components().insertComponent(projectOrView); SnapshotDto analysis1 = dbTester.components().insertSnapshot(projectOrView); SnapshotDto analysis2 = dbTester.components().insertSnapshot(projectOrView); - ComponentDto otherProject = dbTester.components().insertPrivateProject(); + ComponentDto otherProject = dbTester.components().insertPrivateProject().getMainBranchComponent(); SnapshotDto otherAnalysis1 = dbTester.components().insertSnapshot(otherProject); SnapshotDto otherAnalysis2 = dbTester.components().insertSnapshot(otherProject); int count = 5; @@ -329,7 +329,7 @@ public class PurgeCommandsIT { dbTester.components().insertComponent(projectOrView); SnapshotDto analysis1 = dbTester.components().insertSnapshot(projectOrView); SnapshotDto analysis2 = dbTester.components().insertSnapshot(projectOrView); - ComponentDto otherProject = dbTester.components().insertPrivateProject(); + ComponentDto otherProject = dbTester.components().insertPrivateProject().getMainBranchComponent(); SnapshotDto otherAnalysis1 = dbTester.components().insertSnapshot(otherProject); SnapshotDto otherAnalysis2 = dbTester.components().insertSnapshot(otherProject); int count = 5; @@ -352,7 +352,7 @@ public class PurgeCommandsIT { @UseDataProvider("projectsAndViews") public void deleteAbortedAnalyses_deletes_only_analyse_with_unprocessed_status(ComponentDto projectOrView) { dbTester.components().insertComponent(projectOrView); - ComponentDto otherProject = dbTester.components().insertPrivateProject(); + ComponentDto otherProject = dbTester.components().insertPrivateProject().getMainBranchComponent(); Stream.of(projectOrView, otherProject) .forEach(p -> { dbTester.components().insertSnapshot(p, t -> t.setStatus(STATUS_PROCESSED).setLast(false)); @@ -482,7 +482,7 @@ public class PurgeCommandsIT { @UseDataProvider("projects") public void deleteOutdatedProperties_deletes_properties_by_component_uuid(ComponentDto project) { ComponentDto component = dbTester.components().insertComponent(project); - ComponentDto anotherComponent = dbTester.components().insertPublicProject(); + ComponentDto anotherComponent = dbTester.components().insertPublicProject().getMainBranchComponent(); int count = 4; IntStream.range(0, count).forEach(i -> { insertRandomProperty(component); @@ -502,7 +502,7 @@ public class PurgeCommandsIT { RuleDto rule2 = dbTester.rules().insert(); dbTester.components().insertComponent(projectOrView); ComponentDto file = dbTester.components().insertComponent(newFileDto(projectOrView)); - ComponentDto otherProject = dbTester.components().insertPrivateProject(); + ComponentDto otherProject = dbTester.components().insertPrivateProject().getMainBranchComponent(); ComponentDto otherFile = dbTester.components().insertComponent(newFileDto(otherProject)); int count = 5; IntStream.range(0, count).forEach(i -> { @@ -563,7 +563,7 @@ public class PurgeCommandsIT { @Test public void deletePermissions_deletes_permissions_of_public_project() { - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); addPermissions(project); PurgeCommands purgeCommands = new PurgeCommands(dbTester.getSession(), profiler, system2); @@ -575,7 +575,7 @@ public class PurgeCommandsIT { @Test public void deletePermissions_deletes_permissions_of_private_project() { - ComponentDto project = dbTester.components().insertPrivateProject(); + ComponentDto project = dbTester.components().insertPrivateProject().getMainBranchComponent(); addPermissions(project); PurgeCommands purgeCommands = new PurgeCommands(dbTester.getSession(), profiler, system2); @@ -599,7 +599,7 @@ public class PurgeCommandsIT { @Test public void deleteNewCodePeriodsByRootUuid_deletes_branch_new_code_periods() { - ComponentDto project = dbTester.components().insertPrivateProject(); + ComponentDto project = dbTester.components().insertPrivateProject().getMainBranchComponent(); BranchDto branch = newBranchDto(project); dbTester.components().insertProjectBranch(project, branch); @@ -621,7 +621,7 @@ public class PurgeCommandsIT { @Test public void deleteNewCodePeriodsByRootUuid_deletes_project_new_code_periods() { - ComponentDto project = dbTester.components().insertPrivateProject(); + ComponentDto project = dbTester.components().insertPrivateProject().getMainBranchComponent(); BranchDto branch = newBranchDto(project); dbTester.components().insertProjectBranch(project, branch); @@ -643,7 +643,7 @@ public class PurgeCommandsIT { @Test public void deleteNewCodePeriodsByRootUuid_should_not_delete_any_if_root_uuid_is_null() { - ComponentDto project = dbTester.components().insertPrivateProject(); + ComponentDto project = dbTester.components().insertPrivateProject().getMainBranchComponent(); BranchDto branch = newBranchDto(project); dbTester.components().insertProjectBranch(project, branch); @@ -667,8 +667,8 @@ public class PurgeCommandsIT { public void deleteUserDismissedMessages_deletes_dismissed_warnings_on_project_for_all_users() { UserDto user1 = dbTester.users().insertUser(); UserDto user2 = dbTester.users().insertUser(); - ProjectDto project = dbTester.components().insertPrivateProjectDto(); - ProjectDto anotherProject = dbTester.components().insertPrivateProjectDto(); + ProjectDto project = dbTester.components().insertPrivateProject().getProjectDto(); + ProjectDto anotherProject = dbTester.components().insertPrivateProject().getProjectDto(); dbTester.users().insertUserDismissedMessage(user1, project, CeTaskMessageType.SUGGEST_DEVELOPER_EDITION_UPGRADE); dbTester.users().insertUserDismissedMessage(user2, project, CeTaskMessageType.SUGGEST_DEVELOPER_EDITION_UPGRADE); dbTester.users().insertUserDismissedMessage(user1, anotherProject, CeTaskMessageType.SUGGEST_DEVELOPER_EDITION_UPGRADE); @@ -684,8 +684,8 @@ public class PurgeCommandsIT { var portfolio1 = dbTester.components().insertPrivatePortfolioDto(); var portfolio2 = dbTester.components().insertPrivatePortfolioDto(); dbTester.components().insertPrivatePortfolio(); - ProjectDto project = dbTester.components().insertPrivateProjectDto(); - ProjectDto anotherProject = dbTester.components().insertPrivateProjectDto(); + ProjectDto project = dbTester.components().insertPrivateProject().getProjectDto(); + ProjectDto anotherProject = dbTester.components().insertPrivateProject().getProjectDto(); dbTester.components().addPortfolioProject(portfolio1, project, anotherProject); dbTester.components().addPortfolioProjectBranch(portfolio1, project, "projectBranch"); @@ -706,7 +706,7 @@ public class PurgeCommandsIT { public void deleteProjectInPortfolios_deletes_project_and_branch_from_portfolios_if_root_is_project_only_selecting_a_single_branch() { var portfolio1 = dbTester.components().insertPrivatePortfolioDto(); dbTester.components().insertPrivatePortfolio(); - ProjectDto project = dbTester.components().insertPrivateProjectDto(); + ProjectDto project = dbTester.components().insertPrivateProject().getProjectDto(); dbTester.components().addPortfolioProject(portfolio1, project); dbTester.components().addPortfolioProjectBranch(portfolio1, project, "projectBranch"); @@ -723,7 +723,7 @@ public class PurgeCommandsIT { @Test public void deleteProjectInPortfolios_deletes_branch_from_portfolios_if_root_is_branch() { var portfolio1 = dbTester.components().insertPrivatePortfolioDto(); - ProjectDto project = dbTester.components().insertPrivateProjectDto(); + ProjectDto project = dbTester.components().insertPrivateProject().getProjectDto(); dbTester.components().addPortfolioProject(portfolio1, project); dbTester.components().addPortfolioProjectBranch(portfolio1, project, "projectBranch"); diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/purge/PurgeDaoIT.java b/server/sonar-db-dao/src/it/java/org/sonar/db/purge/PurgeDaoIT.java index e70f5ab9739..a3089e156b3 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/purge/PurgeDaoIT.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/purge/PurgeDaoIT.java @@ -126,7 +126,7 @@ public class PurgeDaoIT { @Test public void purge_failed_ce_tasks() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); SnapshotDto pastAnalysis = db.components().insertSnapshot(project, t -> t.setStatus(STATUS_PROCESSED).setLast(false)); db.components().insertSnapshot(project, t -> t.setStatus(STATUS_UNPROCESSED).setLast(false)); SnapshotDto lastAnalysis = db.components().insertSnapshot(project, t -> t.setStatus(STATUS_PROCESSED).setLast(true)); @@ -143,7 +143,7 @@ public class PurgeDaoIT { @Test public void purge_inactive_branches_should_not_purge_newly_created_branches() { when(system2.now()).thenReturn(new Date().getTime()); - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); // new branch without a snapshot (analysis not processed yet) ComponentDto pr1 = db.components().insertProjectBranch(project, b -> b.setBranchType(BranchType.PULL_REQUEST)); @@ -160,7 +160,7 @@ public class PurgeDaoIT { Date date31DaysAgo = DateUtils.addDays(new Date(), -31); when(system2.now()).thenReturn(new Date().getTime()); RuleDto rule = db.rules().insert(); - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto branch1 = db.components().insertProjectBranch(project); ComponentDto branch2 = db.components().insertProjectBranch(project, b -> b.setBranchType(BranchType.BRANCH)); ComponentDto pr1 = db.components().insertProjectBranch(project, b -> b.setBranchType(BranchType.PULL_REQUEST)); @@ -208,7 +208,7 @@ public class PurgeDaoIT { @Test public void purge_inactive_pull_request() { RuleDto rule = db.rules().insert(); - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto nonMainBranch = db.components().insertProjectBranch(project); db.components().insertSnapshot(nonMainBranch); ComponentDto recentPullRequest = db.components().insertProjectBranch(project, b -> b.setBranchType(BranchType.PULL_REQUEST)); @@ -231,7 +231,7 @@ public class PurgeDaoIT { @Test public void purge_inactive_branches_when_analyzing_non_main_branch() { RuleDto rule = db.rules().insert(); - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto nonMainBranch = db.components().insertProjectBranch(project); db.components().insertSnapshot(nonMainBranch); @@ -264,7 +264,7 @@ public class PurgeDaoIT { @Test public void close_issues_clean_index_and_file_sources_of_disabled_components_specified_by_uuid_in_configuration() { RuleDto rule = db.rules().insert(); - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); db.components().insertSnapshot(project); db.components().insertSnapshot(project); db.components().insertSnapshot(project, s -> s.setLast(false)); @@ -346,11 +346,11 @@ public class PurgeDaoIT { @Test public void shouldDeleteAnalyses() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); SnapshotDto analysis1 = db.components().insertSnapshot(project); SnapshotDto analysis2 = db.components().insertSnapshot(project); SnapshotDto analysis3 = db.components().insertSnapshot(project); - ComponentDto otherProject = db.components().insertPrivateProject(); + ComponentDto otherProject = db.components().insertPrivateProject().getMainBranchComponent(); SnapshotDto otherAnalysis1 = db.components().insertSnapshot(otherProject); underTest.deleteAnalyses(dbSession, new PurgeProfiler(), singletonList(analysis1.getUuid())); @@ -374,8 +374,8 @@ public class PurgeDaoIT { EventDto projectEvent2 = db.events().insertEvent(projectAnalysis2); EventDto projectEvent3 = db.events().insertEvent(projectAnalysis3); // note: projectAnalysis4 has no event - ComponentDto referencedProjectA = db.components().insertPublicProject(); - ComponentDto referencedProjectB = db.components().insertPublicProject(); + ComponentDto referencedProjectA = db.components().insertPublicProject().getMainBranchComponent(); + ComponentDto referencedProjectB = db.components().insertPublicProject().getMainBranchComponent(); db.events().insertEventComponentChanges(projectEvent1, projectAnalysis1, randomChangeCategory(), referencedProjectA, null); db.events().insertEventComponentChanges(projectEvent1, projectAnalysis1, randomChangeCategory(), referencedProjectB, null); BranchDto branchProjectA = newBranchDto(referencedProjectA); @@ -478,7 +478,7 @@ public class PurgeDaoIT { @Test public void selectPurgeableAnalyses_does_not_return_the_baseline() { - ComponentDto project1 = db.components().insertPublicProject("master"); + ComponentDto project1 = db.components().insertPublicProject("master").getMainBranchComponent(); SnapshotDto analysis1 = db.components().insertSnapshot(newSnapshot() .setComponentUuid(project1.uuid()) .setStatus(STATUS_PROCESSED) @@ -489,7 +489,7 @@ public class PurgeDaoIT { .setBranchUuid(project1.uuid()) .setType(NewCodePeriodType.SPECIFIC_ANALYSIS) .setValue(analysis1.getUuid())); - ComponentDto project2 = db.components().insertPrivateProject(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); SnapshotDto analysis2 = db.components().insertSnapshot(newSnapshot() .setComponentUuid(project2.uuid()) .setStatus(STATUS_PROCESSED) @@ -504,7 +504,7 @@ public class PurgeDaoIT { @Test public void selectPurgeableAnalyses_does_not_return_the_baseline_of_specific_branch() { - ComponentDto project = db.components().insertPublicProject("master"); + ComponentDto project = db.components().insertPublicProject("master").getMainBranchComponent(); SnapshotDto analysisProject = db.components().insertSnapshot(newSnapshot() .setComponentUuid(project.uuid()) .setStatus(STATUS_PROCESSED) @@ -545,7 +545,7 @@ public class PurgeDaoIT { @Test public void delete_project_and_associated_data() { RuleDto rule = db.rules().insert(); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto directory = db.components().insertComponent(newDirectory(project, "a/b")); ComponentDto file = db.components().insertComponent(newFileDto(directory)); SnapshotDto analysis = db.components().insertSnapshot(project); @@ -555,7 +555,7 @@ public class PurgeDaoIT { FileSourceDto fileSource = db.fileSources().insertFileSource(file); db.issues().insertNewCodeReferenceIssue(newCodeReferenceIssue(issue1)); - ComponentDto otherProject = db.components().insertPrivateProject(); + ComponentDto otherProject = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto otherDirectory = db.components().insertComponent(newDirectory(otherProject, "a/b")); ComponentDto otherFile = db.components().insertComponent(newFileDto(otherDirectory)); SnapshotDto otherAnalysis = db.components().insertSnapshot(otherProject); @@ -580,13 +580,13 @@ public class PurgeDaoIT { @Test public void delete_application() { MetricDto metric = db.measures().insertMetric(); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); BranchDto projectBranch = db.getDbClient().branchDao().selectByUuid(db.getSession(), project.uuid()).get(); RuleDto rule = db.rules().insert(); - ComponentDto app = db.components().insertPrivateApplication(); + ComponentDto app = db.components().insertPrivateApplication().getMainBranchComponent(); ComponentDto appBranch = db.components().insertProjectBranch(app); - ComponentDto otherApp = db.components().insertPrivateApplication(); + ComponentDto otherApp = db.components().insertPrivateApplication().getMainBranchComponent(); ComponentDto otherAppBranch = db.components().insertProjectBranch(otherApp); SnapshotDto appAnalysis = db.components().insertSnapshot(app); @@ -619,13 +619,13 @@ public class PurgeDaoIT { @Test public void delete_application_branch() { MetricDto metric = db.measures().insertMetric(); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); BranchDto projectBranch = db.getDbClient().branchDao().selectByUuid(db.getSession(), project.uuid()).get(); RuleDto rule = db.rules().insert(); - ComponentDto app = db.components().insertPrivateApplication(); + ComponentDto app = db.components().insertPrivateApplication().getMainBranchComponent(); ComponentDto appBranch = db.components().insertProjectBranch(app); - ComponentDto otherApp = db.components().insertPrivateApplication(); + ComponentDto otherApp = db.components().insertPrivateApplication().getMainBranchComponent(); ComponentDto otherAppBranch = db.components().insertProjectBranch(otherApp); SnapshotDto appAnalysis = db.components().insertSnapshot(app); @@ -661,10 +661,10 @@ public class PurgeDaoIT { @Test public void delete_webhooks_from_project() { - ProjectDto project1 = db.components().insertPrivateProjectDto(); + ProjectDto project1 = db.components().insertPrivateProject().getProjectDto(); WebhookDto webhook = db.webhooks().insertWebhook(project1); db.webhookDelivery().insert(webhook); - ProjectDto projectNotToBeDeleted = db.components().insertPrivateProjectDto(); + ProjectDto projectNotToBeDeleted = db.components().insertPrivateProject().getProjectDto(); WebhookDto webhookNotDeleted = db.webhooks().insertWebhook(projectNotToBeDeleted); WebhookDeliveryLiteDto webhookDeliveryNotDeleted = db.webhookDelivery().insert(webhookNotDeleted); @@ -834,8 +834,8 @@ public class PurgeDaoIT { public void delete_rows_in_user_dismissed_messages_when_deleting_project() { UserDto user1 = db.users().insertUser(); UserDto user2 = db.users().insertUser(); - ProjectDto project = db.components().insertPrivateProjectDto(); - ProjectDto anotherProject = db.components().insertPrivateProjectDto(); + ProjectDto project = db.components().insertPrivateProject().getProjectDto(); + ProjectDto anotherProject = db.components().insertPrivateProject().getProjectDto(); UserDismissedMessageDto msg1 = db.users().insertUserDismissedMessage(user1, project, CeTaskMessageType.SUGGEST_DEVELOPER_EDITION_UPGRADE); UserDismissedMessageDto msg2 = db.users().insertUserDismissedMessage(user2, project, CeTaskMessageType.SUGGEST_DEVELOPER_EDITION_UPGRADE); @@ -851,8 +851,8 @@ public class PurgeDaoIT { @Test public void delete_tasks_in_ce_queue_when_deleting_project() { - ComponentDto projectToBeDeleted = db.components().insertPrivateProject(); - ComponentDto anotherLivingProject = db.components().insertPrivateProject(); + ComponentDto projectToBeDeleted = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto anotherLivingProject = db.components().insertPrivateProject().getMainBranchComponent(); // Insert 3 rows in CE_QUEUE: two for the project that will be deleted (in order to check that status // is not involved in deletion), and one on another project @@ -1030,8 +1030,8 @@ public class PurgeDaoIT { EventDto anotherBranchEvent = db.events().insertEvent(anotherBranchAnalysis); SnapshotDto anotherProjectAnalysis = db.components().insertSnapshot(anotherProject); EventDto anotherProjectEvent = db.events().insertEvent(anotherProjectAnalysis); - ComponentDto referencedProjectA = db.components().insertPublicProject(); - ComponentDto referencedProjectB = db.components().insertPublicProject(); + ComponentDto referencedProjectA = db.components().insertPublicProject().getMainBranchComponent(); + ComponentDto referencedProjectB = db.components().insertPublicProject().getMainBranchComponent(); db.events().insertEventComponentChanges(projectEvent1, projectAnalysis1, randomChangeCategory(), referencedProjectA, null); db.events().insertEventComponentChanges(projectEvent1, projectAnalysis1, randomChangeCategory(), referencedProjectB, null); BranchDto branchProjectA = newBranchDto(referencedProjectA); @@ -1074,7 +1074,7 @@ public class PurgeDaoIT { private ComponentDto insertProjectWithBranchAndRelatedData() { RuleDto rule = db.rules().insert(); - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto branch = db.components().insertProjectBranch(project); ComponentDto dir = db.components().insertComponent(newDirectory(branch, "path")); ComponentDto file = db.components().insertComponent(newFileDto(branch, dir)); @@ -1116,7 +1116,7 @@ public class PurgeDaoIT { @Test public void delete_view_and_child() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto view = db.components().insertPrivatePortfolio(); ComponentDto subView = db.components().insertComponent(newSubPortfolio(view)); ComponentDto projectCopy = db.components().insertComponent(newProjectCopy(project, subView)); @@ -1134,8 +1134,8 @@ public class PurgeDaoIT { @Test public void purge_shouldDeleteOrphanIssues() { RuleDto rule = db.rules().insert(); - ComponentDto project = db.components().insertPublicProject(); - ComponentDto otherProject = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); + ComponentDto otherProject = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto dir = db.components().insertComponent(newDirectory(project, "path")); ComponentDto file = db.components().insertComponent(newFileDto(project, dir)); @@ -1155,7 +1155,7 @@ public class PurgeDaoIT { @Test public void should_delete_old_closed_issues() { RuleDto rule = db.rules().insert(); - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto dir = db.components().insertComponent(newDirectory(project, "path")); ComponentDto file = db.components().insertComponent(newFileDto(project, dir)); @@ -1198,7 +1198,7 @@ public class PurgeDaoIT { @Test public void delete_disabled_components_without_issues() { - ComponentDto project = db.components().insertPublicProject(p -> p.setEnabled(true)); + ComponentDto project = db.components().insertPublicProject(p -> p.setEnabled(true)).getMainBranchComponent(); ComponentDto enabledFileWithIssues = db.components().insertComponent(newFileDto(project).setEnabled(true)); ComponentDto disabledFileWithIssues = db.components().insertComponent(newFileDto(project).setEnabled(false)); ComponentDto enabledFileWithoutIssues = db.components().insertComponent(newFileDto(project).setEnabled(true)); @@ -1232,9 +1232,9 @@ public class PurgeDaoIT { @Test public void delete_ce_analysis_older_than_180_and_scanner_context_older_than_40_days_of_specified_project_when_purging_project() { LocalDateTime now = LocalDateTime.now(); - ComponentDto project1 = db.components().insertPublicProject(); + ComponentDto project1 = db.components().insertPublicProject().getMainBranchComponent(); Consumer belongsToProject1 = t -> t.setMainComponentUuid(project1.uuid()).setComponentUuid(project1.uuid()); - ComponentDto project2 = db.components().insertPublicProject(); + ComponentDto project2 = db.components().insertPublicProject().getMainBranchComponent(); Consumer belongsToProject2 = t -> t.setMainComponentUuid(project2.uuid()).setComponentUuid(project2.uuid()); insertCeActivityAndChildDataWithDate("VERY_OLD_1", now.minusDays(180).minusMonths(10), belongsToProject1); @@ -1290,7 +1290,7 @@ public class PurgeDaoIT { @Test public void delete_ce_analysis_older_than_180_and_scanner_context_older_than_40_days_of_project_and_branches_when_purging_project() { LocalDateTime now = LocalDateTime.now(); - ComponentDto project1 = db.components().insertPublicProject(); + ComponentDto project1 = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto branch1 = db.components().insertProjectBranch(project1, b -> b.setExcludeFromPurge(true)); Consumer belongsToProject1 = t -> t.setMainComponentUuid(project1.uuid()).setComponentUuid(project1.uuid()); Consumer belongsToBranch1 = t -> t.setMainComponentUuid(project1.uuid()).setComponentUuid(branch1.uuid()); @@ -1348,7 +1348,7 @@ public class PurgeDaoIT { @Test public void delete_ce_analysis_of_branch_older_than_180_and_scanner_context_older_than_40_days_when_purging_branch() { LocalDateTime now = LocalDateTime.now(); - ComponentDto project1 = db.components().insertPublicProject(); + ComponentDto project1 = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto branch1 = db.components().insertProjectBranch(project1); Consumer belongsToProject1 = t -> t.setMainComponentUuid(project1.uuid()).setComponentUuid(project1.uuid()); Consumer belongsToBranch1 = t -> t.setMainComponentUuid(project1.uuid()).setComponentUuid(branch1.uuid()); @@ -1405,7 +1405,7 @@ public class PurgeDaoIT { @Test public void deleteProject_deletes_webhook_deliveries() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); dbClient.webhookDeliveryDao().insert(dbSession, newDto().setComponentUuid(project.uuid()).setUuid("D1").setDurationMs(1000).setWebhookUuid("webhook-uuid")); dbClient.webhookDeliveryDao().insert(dbSession, newDto().setComponentUuid("P2").setUuid("D2").setDurationMs(1000).setWebhookUuid("webhook-uuid")); @@ -1416,7 +1416,7 @@ public class PurgeDaoIT { @Test public void deleteProject_deletes_project_mappings() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); dbClient.projectMappingsDao().put(dbSession, "a.key.type", "a.key", project.uuid()); dbClient.projectMappingsDao().put(dbSession, "a.key.type", "another.key", "D2"); @@ -1428,8 +1428,8 @@ public class PurgeDaoIT { @Test public void deleteProject_deletes_project_alm_settings() { - ProjectDto project = db.components().insertPublicProjectDto(); - ProjectDto otherProject = db.components().insertPublicProjectDto(); + ProjectDto project = db.components().insertPublicProject().getProjectDto(); + ProjectDto otherProject = db.components().insertPublicProject().getProjectDto(); AlmSettingDto almSettingDto = db.almSettings().insertGitlabAlmSetting(); db.almSettings().insertGitlabProjectAlmSetting(almSettingDto, project); db.almSettings().insertGitlabProjectAlmSetting(almSettingDto, otherProject); @@ -1442,7 +1442,7 @@ public class PurgeDaoIT { @Test public void deleteBranch_deletes_scanner_cache() throws IOException { - ProjectDto project = db.components().insertPublicProjectDto(); + ProjectDto project = db.components().insertPublicProject().getProjectDto(); BranchDto branch = db.components().insertProjectBranch(project); dbClient.scannerAnalysisCacheDao().insert(dbSession, branch.getUuid(), IOUtils.toInputStream("test1", UTF_8)); dbClient.scannerAnalysisCacheDao().insert(dbSession, project.getUuid(), IOUtils.toInputStream("test2", UTF_8)); @@ -1457,7 +1457,7 @@ public class PurgeDaoIT { @Test public void deleteProject_deletes_scanner_cache() throws IOException { - ProjectDto project = db.components().insertPublicProjectDto(); + ProjectDto project = db.components().insertPublicProject().getProjectDto(); BranchDto branch = db.components().insertProjectBranch(project); dbClient.scannerAnalysisCacheDao().insert(dbSession, branch.getUuid(), IOUtils.toInputStream("test1", UTF_8)); dbClient.scannerAnalysisCacheDao().insert(dbSession, project.getUuid(), IOUtils.toInputStream("test2", UTF_8)); @@ -1470,8 +1470,8 @@ public class PurgeDaoIT { @Test public void deleteProject_deletes_project_badge_tokens() { - ProjectDto project = db.components().insertPublicProjectDto(); - ProjectDto otherProject = db.components().insertPublicProjectDto(); + ProjectDto project = db.components().insertPublicProject().getProjectDto(); + ProjectDto otherProject = db.components().insertPublicProject().getProjectDto(); dbClient.projectBadgeTokenDao().insert(dbSession, "token_to_delete", project, "user-uuid", "user-login"); dbClient.projectBadgeTokenDao().insert(dbSession, "token_to_not_delete", otherProject, "user-uuid", "user-login"); @@ -1486,8 +1486,8 @@ public class PurgeDaoIT { ComponentDto portfolio1 = db.components().insertPrivatePortfolio(); ComponentDto portfolio2 = db.components().insertPrivatePortfolio(); - ProjectDto project = db.components().insertPublicProjectDto(); - ProjectDto otherProject = db.components().insertPublicProjectDto(); + ProjectDto project = db.components().insertPublicProject().getProjectDto(); + ProjectDto otherProject = db.components().insertPublicProject().getProjectDto(); db.components().addPortfolioProject(portfolio1, project.getUuid(), otherProject.getUuid()); db.components().addPortfolioProject(portfolio2, project.getUuid()); @@ -1501,13 +1501,13 @@ public class PurgeDaoIT { @Test public void deleteProject_deletes_app_projects() { - ProjectDto app = db.components().insertPrivateApplicationDto(); + ProjectDto app = db.components().insertPrivateApplication().getProjectDto(); BranchDto appBranch = db.components().insertProjectBranch(app); - ProjectDto project = db.components().insertPublicProjectDto(); + ProjectDto project = db.components().insertPublicProject().getProjectDto(); BranchDto projectBranch = db.components().insertProjectBranch(project); - ProjectDto otherProject = db.components().insertPublicProjectDto(); + ProjectDto otherProject = db.components().insertPublicProject().getProjectDto(); db.components().addApplicationProject(app, project, otherProject); db.components().addProjectBranchToApplicationBranch(appBranch, projectBranch); @@ -1535,22 +1535,22 @@ public class PurgeDaoIT { public void deleteNonRootComponents_has_no_effect_when_parameter_contains_only_projects_and_or_views() { ComponentDbTester componentDbTester = db.components(); - verifyNoEffect(componentDbTester.insertPrivateProject()); - verifyNoEffect(componentDbTester.insertPublicProject()); + verifyNoEffect(componentDbTester.insertPrivateProject().getMainBranchComponent()); + verifyNoEffect(componentDbTester.insertPublicProject().getMainBranchComponent()); verifyNoEffect(componentDbTester.insertPrivatePortfolio()); - verifyNoEffect(componentDbTester.insertPrivatePortfolio(), componentDbTester.insertPrivateProject(), componentDbTester.insertPublicProject()); + verifyNoEffect(componentDbTester.insertPrivatePortfolio(), componentDbTester.insertPrivateProject().getMainBranchComponent(), componentDbTester.insertPublicProject().getMainBranchComponent()); } @Test public void delete_live_measures_when_deleting_project() { MetricDto metric = db.measures().insertMetric(); - ComponentDto project1 = db.components().insertPublicProject(); + ComponentDto project1 = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto dir1 = db.components().insertComponent(newDirectory(project1, "path")); db.measures().insertLiveMeasure(project1, metric); db.measures().insertLiveMeasure(dir1, metric); - ComponentDto project2 = db.components().insertPublicProject(); + ComponentDto project2 = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto dir2 = db.components().insertComponent(newDirectory(project2, "path")); db.measures().insertLiveMeasure(project2, metric); db.measures().insertLiveMeasure(dir2, metric); @@ -1573,7 +1573,7 @@ public class PurgeDaoIT { @Test public void deleteNonRootComponents_deletes_only_non_root_components_of_a_project_from_table_components() { - ComponentDto project = new Random().nextBoolean() ? db.components().insertPublicProject() : db.components().insertPrivateProject(); + ComponentDto project = new Random().nextBoolean() ? db.components().insertPublicProject().getMainBranchComponent() : db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto dir1 = db.components().insertComponent(newDirectory(project, "A/B")); ComponentDto file1 = db.components().insertComponent(newFileDto(project, dir1)); @@ -1595,9 +1595,9 @@ public class PurgeDaoIT { @Test public void deleteNonRootComponents_deletes_only_non_root_components_of_a_view_from_table_components() { ComponentDto[] projects = { - db.components().insertPrivateProject(), - db.components().insertPrivateProject(), - db.components().insertPrivateProject() + db.components().insertPrivateProject().getMainBranchComponent(), + db.components().insertPrivateProject().getMainBranchComponent(), + db.components().insertPrivateProject().getMainBranchComponent() }; ComponentDto view = db.components().insertPrivatePortfolio(); @@ -1620,7 +1620,7 @@ public class PurgeDaoIT { @Test public void deleteNonRootComponents_deletes_only_specified_non_root_components_of_a_project_from_table_components() { - ComponentDto project = new Random().nextBoolean() ? db.components().insertPublicProject() : db.components().insertPrivateProject(); + ComponentDto project = new Random().nextBoolean() ? db.components().insertPublicProject().getMainBranchComponent() : db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto dir1 = db.components().insertComponent(newDirectory(project, "A/B")); ComponentDto dir2 = db.components().insertComponent(newDirectory(project, "A/C")); ComponentDto file1 = db.components().insertComponent(newFileDto(project, dir1)); @@ -1639,9 +1639,9 @@ public class PurgeDaoIT { @Test public void deleteNonRootComponents_deletes_only_specified_non_root_components_of_a_view_from_table_components() { ComponentDto[] projects = { - db.components().insertPrivateProject(), - db.components().insertPrivateProject(), - db.components().insertPrivateProject() + db.components().insertPrivateProject().getMainBranchComponent(), + db.components().insertPrivateProject().getMainBranchComponent(), + db.components().insertPrivateProject().getMainBranchComponent() }; ComponentDto view = db.components().insertPrivatePortfolio(); @@ -1666,7 +1666,7 @@ public class PurgeDaoIT { public void deleteNonRootComponents_deletes_measures_of_any_non_root_component_of_a_view() { ComponentDto view = db.components().insertPrivatePortfolio(); ComponentDto subview = db.components().insertComponent(newSubPortfolio(view)); - ComponentDto pc = db.components().insertComponent(newProjectCopy("a", db.components().insertPrivateProject(), view)); + ComponentDto pc = db.components().insertComponent(newProjectCopy("a", db.components().insertPrivateProject().getMainBranchComponent(), view)); insertMeasureFor(view, subview, pc); assertThat(getComponentUuidsOfMeasures()).containsOnly(view.uuid(), subview.uuid(), pc.uuid()); @@ -1685,7 +1685,7 @@ public class PurgeDaoIT { ComponentDto subview1 = db.components().insertComponent(newSubPortfolio(view)); ComponentDto subview2 = db.components().insertComponent(newSubPortfolio(subview1)); ComponentDto subview3 = db.components().insertComponent(newSubPortfolio(view)); - ComponentDto pc = db.components().insertComponent(newProjectCopy("a", db.components().insertPrivateProject(), view)); + ComponentDto pc = db.components().insertComponent(newProjectCopy("a", db.components().insertPrivateProject().getMainBranchComponent(), view)); insertPropertyFor(view, subview1, subview2, subview3, pc); assertThat(getResourceIdOfProperties()).containsOnly(view.uuid(), subview1.uuid(), subview2.uuid(), subview3.uuid(), pc.uuid()); diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/purge/PurgeDaoWithAuditIT.java b/server/sonar-db-dao/src/it/java/org/sonar/db/purge/PurgeDaoWithAuditIT.java index 38f2dabd388..05ceeb5c841 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/purge/PurgeDaoWithAuditIT.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/purge/PurgeDaoWithAuditIT.java @@ -54,7 +54,7 @@ public class PurgeDaoWithAuditIT { @Test public void delete_project_persist_audit_with_uuid_and_name() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); underTestWithPersister.deleteProject(dbSession, project.uuid(), project.qualifier(), project.name(), project.getKey()); diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/purge/PurgeMapperIT.java b/server/sonar-db-dao/src/it/java/org/sonar/db/purge/PurgeMapperIT.java index 848ac72b82e..8dccd42caf3 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/purge/PurgeMapperIT.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/purge/PurgeMapperIT.java @@ -67,7 +67,7 @@ public class PurgeMapperIT { } private ComponentDto randomPublicOrPrivateProject() { - return new Random().nextBoolean() ? db.components().insertPrivateProject() : db.components().insertPublicProject(); + return new Random().nextBoolean() ? db.components().insertPrivateProject().getMainBranchComponent() : db.components().insertPublicProject().getMainBranchComponent(); } @Test @@ -80,7 +80,7 @@ public class PurgeMapperIT { @Test public void selectRootAndSubviewsByProjectUuid_returns_application_with_specified_uuid() { - ComponentDto view = db.components().insertPublicApplication(); + ComponentDto view = db.components().insertPublicApplication().getMainBranchComponent(); assertThat(purgeMapper.selectRootAndSubviewsByProjectUuid(view.uuid())) .containsOnly(view.uuid()); @@ -99,7 +99,7 @@ public class PurgeMapperIT { @Test public void selectRootAndSubviewsByProjectUuid_does_not_return_project_copy_with_specified_project_uuid() { - ComponentDto privateProject = db.components().insertPrivateProject(); + ComponentDto privateProject = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto view = db.components().insertPrivatePortfolio(); db.components().insertComponent(ComponentTesting.newProjectCopy("a", view, privateProject)); @@ -109,7 +109,7 @@ public class PurgeMapperIT { @Test public void selectRootAndSubviewsByProjectUuid_does_not_return_directory_with_specified_uuid() { - ComponentDto privateProject = db.components().insertPrivateProject(); + ComponentDto privateProject = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto directory = db.components().insertComponent(ComponentTesting.newDirectory(privateProject, "A/B")); assertThat(purgeMapper.selectRootAndSubviewsByProjectUuid(directory.uuid())) @@ -118,7 +118,7 @@ public class PurgeMapperIT { @Test public void selectRootAndSubviewsByProjectUuid_does_not_return_file_with_specified_uuid() { - ComponentDto privateProject = db.components().insertPrivateProject(); + ComponentDto privateProject = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(ComponentTesting.newFileDto(privateProject)); assertThat(purgeMapper.selectRootAndSubviewsByProjectUuid(file.uuid())) @@ -136,7 +136,7 @@ public class PurgeMapperIT { @Test public void selectRootAndSubviewsByProjectUuid_does_not_return_technicalCopy_with_specified_uuid() { - ComponentDto privateProject = db.components().insertPrivateProject(); + ComponentDto privateProject = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto view = db.components().insertPrivatePortfolio(); ComponentDto technicalCopy = db.components().insertComponent(ComponentTesting.newProjectCopy("a", view, privateProject)); diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/qualitygate/ProjectQgateAssociationDaoIT.java b/server/sonar-db-dao/src/it/java/org/sonar/db/qualitygate/ProjectQgateAssociationDaoIT.java index 3fc1a4c6346..f79113cce42 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/qualitygate/ProjectQgateAssociationDaoIT.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/qualitygate/ProjectQgateAssociationDaoIT.java @@ -43,12 +43,12 @@ public class ProjectQgateAssociationDaoIT { public void select_all_projects_by_query() { QualityGateDto qualityGate1 = db.qualityGates().insertQualityGate(); QualityGateDto qualityGate2 = db.qualityGates().insertQualityGate(); - ComponentDto project1 = db.components().insertPrivateProject(); - ComponentDto project2 = db.components().insertPrivateProject(); - ComponentDto project3 = db.components().insertPrivateProject(); - db.qualityGates().associateProjectToQualityGate(db.components().getProjectDto(project1), qualityGate1); - db.qualityGates().associateProjectToQualityGate(db.components().getProjectDto(project2), qualityGate1); - db.qualityGates().associateProjectToQualityGate(db.components().getProjectDto(project3), qualityGate2); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project3 = db.components().insertPrivateProject().getMainBranchComponent(); + db.qualityGates().associateProjectToQualityGate(db.components().getProjectDtoByMainBranch(project1), qualityGate1); + db.qualityGates().associateProjectToQualityGate(db.components().getProjectDtoByMainBranch(project2), qualityGate1); + db.qualityGates().associateProjectToQualityGate(db.components().getProjectDtoByMainBranch(project3), qualityGate2); List result = underTest.selectProjects(dbSession, ProjectQgateAssociationQuery.builder() .qualityGate(qualityGate1) @@ -65,12 +65,12 @@ public class ProjectQgateAssociationDaoIT { @Test public void select_all_projects_by_query_should_have_deterministic_order() { QualityGateDto qualityGate1 = db.qualityGates().insertQualityGate(); - ComponentDto project1 = db.components().insertPrivateProject(d -> d.setName("p1").setKey("key1")); - ComponentDto project2 = db.components().insertPrivateProject(d -> d.setName("p1").setKey("key2")); - ComponentDto project3 = db.components().insertPrivateProject(d -> d.setName("p2").setKey("key3")); - db.qualityGates().associateProjectToQualityGate(db.components().getProjectDto(project1), qualityGate1); - db.qualityGates().associateProjectToQualityGate(db.components().getProjectDto(project2), qualityGate1); - db.qualityGates().associateProjectToQualityGate(db.components().getProjectDto(project3), qualityGate1); + ComponentDto project1 = db.components().insertPrivateProject(d -> d.setName("p1").setKey("key1")).getMainBranchComponent(); + ComponentDto project2 = db.components().insertPrivateProject(d -> d.setName("p1").setKey("key2")).getMainBranchComponent(); + ComponentDto project3 = db.components().insertPrivateProject(d -> d.setName("p2").setKey("key3")).getMainBranchComponent(); + db.qualityGates().associateProjectToQualityGate(db.components().getProjectDtoByMainBranch(project1), qualityGate1); + db.qualityGates().associateProjectToQualityGate(db.components().getProjectDtoByMainBranch(project2), qualityGate1); + db.qualityGates().associateProjectToQualityGate(db.components().getProjectDtoByMainBranch(project3), qualityGate1); List result = underTest.selectProjects(dbSession, ProjectQgateAssociationQuery.builder() .qualityGate(qualityGate1) @@ -84,11 +84,11 @@ public class ProjectQgateAssociationDaoIT { @Test public void select_projects_by_query() { QualityGateDto qualityGate = db.qualityGates().insertQualityGate(); - ComponentDto project1 = db.components().insertPrivateProject(); - ComponentDto project2 = db.components().insertPrivateProject(); - ComponentDto project3 = db.components().insertPrivateProject(); - db.qualityGates().associateProjectToQualityGate(db.components().getProjectDto(project1), qualityGate); - db.qualityGates().associateProjectToQualityGate(db.components().getProjectDto(project2), qualityGate); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project3 = db.components().insertPrivateProject().getMainBranchComponent(); + db.qualityGates().associateProjectToQualityGate(db.components().getProjectDtoByMainBranch(project1), qualityGate); + db.qualityGates().associateProjectToQualityGate(db.components().getProjectDtoByMainBranch(project2), qualityGate); assertThat(underTest.selectProjects(dbSession, ProjectQgateAssociationQuery.builder() .qualityGate(qualityGate) @@ -110,11 +110,11 @@ public class ProjectQgateAssociationDaoIT { @Test public void search_by_project_name() { QualityGateDto qualityGate = db.qualityGates().insertQualityGate(); - ComponentDto project1 = db.components().insertPrivateProject(p -> p.setName("Project One")); - ComponentDto project2 = db.components().insertPrivateProject(p -> p.setName("Project Two")); - ComponentDto project3 = db.components().insertPrivateProject(p -> p.setName("Project Three")); - db.qualityGates().associateProjectToQualityGate(db.components().getProjectDto(project1), qualityGate); - db.qualityGates().associateProjectToQualityGate(db.components().getProjectDto(project2), qualityGate); + ComponentDto project1 = db.components().insertPrivateProject(p -> p.setName("Project One")).getMainBranchComponent(); + ComponentDto project2 = db.components().insertPrivateProject(p -> p.setName("Project Two")).getMainBranchComponent(); + ComponentDto project3 = db.components().insertPrivateProject(p -> p.setName("Project Three")).getMainBranchComponent(); + db.qualityGates().associateProjectToQualityGate(db.components().getProjectDtoByMainBranch(project1), qualityGate); + db.qualityGates().associateProjectToQualityGate(db.components().getProjectDtoByMainBranch(project2), qualityGate); assertThat(underTest.selectProjects(dbSession, ProjectQgateAssociationQuery.builder() .qualityGate(qualityGate) @@ -134,9 +134,9 @@ public class ProjectQgateAssociationDaoIT { @Test public void sorted_by_project_name() { QualityGateDto qualityGate = db.qualityGates().insertQualityGate(); - ComponentDto project1 = db.components().insertPrivateProject(p -> p.setName("Project One")); - ComponentDto project2 = db.components().insertPrivateProject(p -> p.setName("Project Two")); - ComponentDto project3 = db.components().insertPrivateProject(p -> p.setName("Project Three")); + ComponentDto project1 = db.components().insertPrivateProject(p -> p.setName("Project One")).getMainBranchComponent(); + ComponentDto project2 = db.components().insertPrivateProject(p -> p.setName("Project Two")).getMainBranchComponent(); + ComponentDto project3 = db.components().insertPrivateProject(p -> p.setName("Project Three")).getMainBranchComponent(); assertThat(underTest.selectProjects(dbSession, ProjectQgateAssociationQuery.builder() .qualityGate(qualityGate) @@ -151,16 +151,16 @@ public class ProjectQgateAssociationDaoIT { QualityGateDto qualityGate1 = db.qualityGates().insertQualityGate(); QualityGateDto qualityGate2 = db.qualityGates().insertQualityGate(); - ComponentDto project1 = db.components().insertPrivateProject(); - ComponentDto project2 = db.components().insertPrivateProject(); - ComponentDto project3 = db.components().insertPrivateProject(); - ComponentDto project4 = db.components().insertPrivateProject(); - ComponentDto project5 = db.components().insertPrivateProject(); - db.qualityGates().associateProjectToQualityGate(db.components().getProjectDto(project1), qualityGate1); - db.qualityGates().associateProjectToQualityGate(db.components().getProjectDto(project2), qualityGate2); - db.qualityGates().associateProjectToQualityGate(db.components().getProjectDto(project3), qualityGate1); - db.qualityGates().associateProjectToQualityGate(db.components().getProjectDto(project4), qualityGate2); - db.qualityGates().associateProjectToQualityGate(db.components().getProjectDto(project5), qualityGate1); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project3 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project4 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project5 = db.components().insertPrivateProject().getMainBranchComponent(); + db.qualityGates().associateProjectToQualityGate(db.components().getProjectDtoByMainBranch(project1), qualityGate1); + db.qualityGates().associateProjectToQualityGate(db.components().getProjectDtoByMainBranch(project2), qualityGate2); + db.qualityGates().associateProjectToQualityGate(db.components().getProjectDtoByMainBranch(project3), qualityGate1); + db.qualityGates().associateProjectToQualityGate(db.components().getProjectDtoByMainBranch(project4), qualityGate2); + db.qualityGates().associateProjectToQualityGate(db.components().getProjectDtoByMainBranch(project5), qualityGate1); List result = underTest.selectAll(dbSession); @@ -176,7 +176,7 @@ public class ProjectQgateAssociationDaoIT { @Test public void select_qgate_uuid_is_absent() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); Optional result = underTest.selectQGateUuidByProjectUuid(dbSession, project.uuid()); @@ -187,10 +187,10 @@ public class ProjectQgateAssociationDaoIT { public void select_qgate_uuid() { QualityGateDto qualityGate1 = db.qualityGates().insertQualityGate(); QualityGateDto qualityGate2 = db.qualityGates().insertQualityGate(); - ComponentDto project1 = db.components().insertPrivateProject(); - ComponentDto project2 = db.components().insertPrivateProject(); - db.qualityGates().associateProjectToQualityGate(db.components().getProjectDto(project1), qualityGate1); - db.qualityGates().associateProjectToQualityGate(db.components().getProjectDto(project2), qualityGate2); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); + db.qualityGates().associateProjectToQualityGate(db.components().getProjectDtoByMainBranch(project1), qualityGate1); + db.qualityGates().associateProjectToQualityGate(db.components().getProjectDtoByMainBranch(project2), qualityGate2); Optional result = underTest.selectQGateUuidByProjectUuid(dbSession, project1.uuid()); @@ -200,7 +200,7 @@ public class ProjectQgateAssociationDaoIT { @Test public void delete_by_project_uuid() { QualityGateDto qualityGate = db.qualityGates().insertQualityGate(); - ProjectDto project = db.components().insertPrivateProjectDto(); + ProjectDto project = db.components().insertPrivateProject().getProjectDto(); db.qualityGates().associateProjectToQualityGate(project, qualityGate); @@ -214,7 +214,7 @@ public class ProjectQgateAssociationDaoIT { @Test public void delete_by_qgate_uuid() { QualityGateDto qualityGate = db.qualityGates().insertQualityGate(); - ProjectDto project = db.components().insertPrivateProjectDto(); + ProjectDto project = db.components().insertPrivateProject().getProjectDto(); db.qualityGates().associateProjectToQualityGate(project, qualityGate); @@ -229,7 +229,7 @@ public class ProjectQgateAssociationDaoIT { public void update_project_qgate_association() { QualityGateDto firstQualityGate = db.qualityGates().insertQualityGate(); QualityGateDto secondQualityGate = db.qualityGates().insertQualityGate(); - ProjectDto project = db.components().insertPrivateProjectDto(); + ProjectDto project = db.components().insertPrivateProject().getProjectDto(); db.qualityGates().associateProjectToQualityGate(project, firstQualityGate); diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/qualitygate/QualityGateDaoIT.java b/server/sonar-db-dao/src/it/java/org/sonar/db/qualitygate/QualityGateDaoIT.java index 1dd49a244d1..a93511b6e8b 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/qualitygate/QualityGateDaoIT.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/qualitygate/QualityGateDaoIT.java @@ -112,7 +112,7 @@ public class QualityGateDaoIT { @Test public void select_by_project_uuid() { - ProjectDto project = db.components().insertPrivateProjectDto(); + ProjectDto project = db.components().insertPrivateProject().getProjectDto(); QualityGateDto qualityGate1 = db.qualityGates().insertQualityGate(); QualityGateDto qualityGate2 = db.qualityGates().insertQualityGate(); @@ -127,7 +127,7 @@ public class QualityGateDaoIT { @Test public void selectQualityGateFindings_returns_all_quality_gate_details_for_project() { - ProjectDto project = db.components().insertPublicProjectDto(); + ProjectDto project = db.components().insertPublicProject().getProjectDto(); BranchDto branch = db.components().insertProjectBranch(project).setBranchType(BranchType.BRANCH); QualityGateDto gate = db.qualityGates().insertQualityGate(); db.qualityGates().setDefaultQualityGate(gate); diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/qualityprofile/QualityProfileDaoIT.java b/server/sonar-db-dao/src/it/java/org/sonar/db/qualityprofile/QualityProfileDaoIT.java index 228dc74c465..b37a1067bb2 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/qualityprofile/QualityProfileDaoIT.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/qualityprofile/QualityProfileDaoIT.java @@ -233,9 +233,9 @@ public class QualityProfileDaoIT { public void test_deleteProjectAssociationsByProfileUuids() { QProfileDto profile1 = db.qualityProfiles().insert(); QProfileDto profile2 = db.qualityProfiles().insert(); - ProjectDto project1 = db.components().insertPrivateProjectDto(); - ProjectDto project2 = db.components().insertPrivateProjectDto(); - ProjectDto project3 = db.components().insertPrivateProjectDto(); + ProjectDto project1 = db.components().insertPrivateProject().getProjectDto(); + ProjectDto project2 = db.components().insertPrivateProject().getProjectDto(); + ProjectDto project3 = db.components().insertPrivateProject().getProjectDto(); db.qualityProfiles().associateWithProject(project1, profile1); db.qualityProfiles().associateWithProject(project2, profile1); @@ -252,7 +252,7 @@ public class QualityProfileDaoIT { @Test public void deleteProjectAssociationsByProfileUuids_does_nothing_if_empty_uuids() { QProfileDto profile = db.qualityProfiles().insert(); - ProjectDto project = db.components().insertPrivateProjectDto(); + ProjectDto project = db.components().insertPrivateProject().getProjectDto(); db.qualityProfiles().associateWithProject(project, profile); underTest.deleteProjectAssociationsByProfileUuids(dbSession, Collections.emptyList()); @@ -626,8 +626,8 @@ public class QualityProfileDaoIT { public void countProjectsByProfileKey() { QProfileDto profileWithoutProjects = db.qualityProfiles().insert(); QProfileDto profileWithProjects = db.qualityProfiles().insert(); - ProjectDto project1 = db.components().insertPrivateProjectDto(); - ProjectDto project2 = db.components().insertPrivateProjectDto(); + ProjectDto project1 = db.components().insertPrivateProject().getProjectDto(); + ProjectDto project2 = db.components().insertPrivateProject().getProjectDto(); db.qualityProfiles().associateWithProject(project1, profileWithProjects); db.qualityProfiles().associateWithProject(project2, profileWithProjects); @@ -639,8 +639,8 @@ public class QualityProfileDaoIT { @Test public void test_selectAssociatedToProjectAndLanguage() { - ProjectDto project1 = db.components().insertPublicProjectDto(); - ProjectDto project2 = db.components().insertPublicProjectDto(); + ProjectDto project1 = db.components().insertPublicProject().getProjectDto(); + ProjectDto project2 = db.components().insertPublicProject().getProjectDto(); QProfileDto javaProfile = db.qualityProfiles().insert(p -> p.setLanguage("java")); QProfileDto jsProfile = db.qualityProfiles().insert(p -> p.setLanguage("js")); db.qualityProfiles().associateWithProject(project1, javaProfile, jsProfile); @@ -653,8 +653,8 @@ public class QualityProfileDaoIT { @Test public void test_selectAssociatedToProjectUuidAndLanguages() { - ProjectDto project1 = db.components().insertPublicProjectDto(); - ProjectDto project2 = db.components().insertPublicProjectDto(); + ProjectDto project1 = db.components().insertPublicProject().getProjectDto(); + ProjectDto project2 = db.components().insertPublicProject().getProjectDto(); QProfileDto javaProfile = db.qualityProfiles().insert(p -> p.setLanguage("java")); QProfileDto jsProfile = db.qualityProfiles().insert(p -> p.setLanguage("js")); db.qualityProfiles().associateWithProject(project1, javaProfile, jsProfile); @@ -675,9 +675,9 @@ public class QualityProfileDaoIT { @Test public void test_selectQProfileUuidsByProjectUuid() { - ProjectDto project1 = db.components().insertPublicProjectDto(); - ProjectDto project2 = db.components().insertPublicProjectDto(); - ProjectDto project3 = db.components().insertPublicProjectDto(); + ProjectDto project1 = db.components().insertPublicProject().getProjectDto(); + ProjectDto project2 = db.components().insertPublicProject().getProjectDto(); + ProjectDto project3 = db.components().insertPublicProject().getProjectDto(); QProfileDto javaProfile = db.qualityProfiles().insert(p -> p.setLanguage("java")); QProfileDto jsProfile = db.qualityProfiles().insert(p -> p.setLanguage("js")); QProfileDto cProfile = db.qualityProfiles().insert(p -> p.setLanguage("c")); @@ -698,9 +698,9 @@ public class QualityProfileDaoIT { @Test public void test_selectQProfilesByProjectUuid() { - ProjectDto project1 = db.components().insertPublicProjectDto(); - ProjectDto project2 = db.components().insertPublicProjectDto(); - ProjectDto project3 = db.components().insertPublicProjectDto(); + ProjectDto project1 = db.components().insertPublicProject().getProjectDto(); + ProjectDto project2 = db.components().insertPublicProject().getProjectDto(); + ProjectDto project3 = db.components().insertPublicProject().getProjectDto(); QProfileDto javaProfile = db.qualityProfiles().insert(p -> p.setLanguage("java")); QProfileDto jsProfile = db.qualityProfiles().insert(p -> p.setLanguage("js")); QProfileDto cProfile = db.qualityProfiles().insert(p -> p.setLanguage("c")); @@ -719,7 +719,7 @@ public class QualityProfileDaoIT { @Test public void test_updateProjectProfileAssociation() { - ProjectDto project = db.components().insertPrivateProjectDto(); + ProjectDto project = db.components().insertPrivateProject().getProjectDto(); QProfileDto javaProfile1 = db.qualityProfiles().insert(p -> p.setLanguage("java")); QProfileDto jsProfile = db.qualityProfiles().insert(p -> p.setLanguage("js")); QProfileDto javaProfile2 = db.qualityProfiles().insert(p -> p.setLanguage("java")); @@ -746,20 +746,20 @@ public class QualityProfileDaoIT { @Test public void select_selected_projects() { - ComponentDto project1 = db.components().insertPrivateProject(t -> t.setName("Project1 name")); - ComponentDto project2 = db.components().insertPrivateProject(t -> t.setName("Project2 name")); - ComponentDto project3 = db.components().insertPrivateProject(t -> t.setName("Project3 name")); - db.components().insertPrivateProject(t -> t.setName("Project4 name")); + ComponentDto project1 = db.components().insertPrivateProject(t -> t.setName("Project1 name")).getMainBranchComponent(); + ComponentDto project2 = db.components().insertPrivateProject(t -> t.setName("Project2 name")).getMainBranchComponent(); + ComponentDto project3 = db.components().insertPrivateProject(t -> t.setName("Project3 name")).getMainBranchComponent(); + db.components().insertPrivateProject(t -> t.setName("Project4 name")).getMainBranchComponent(); db.components().insertProjectBranch(project1, t -> t.setKey("branch")); QProfileDto profile1 = newQualityProfileDto(); db.qualityProfiles().insert(profile1); - db.qualityProfiles().associateWithProject(db.components().getProjectDto(project1), profile1); - db.qualityProfiles().associateWithProject(db.components().getProjectDto(project2), profile1); + db.qualityProfiles().associateWithProject(db.components().getProjectDtoByMainBranch(project1), profile1); + db.qualityProfiles().associateWithProject(db.components().getProjectDtoByMainBranch(project2), profile1); QProfileDto profile2 = newQualityProfileDto(); db.qualityProfiles().insert(profile2); - db.qualityProfiles().associateWithProject(db.components().getProjectDto(project3), profile2); + db.qualityProfiles().associateWithProject(db.components().getProjectDtoByMainBranch(project3), profile2); QProfileDto profile3 = newQualityProfileDto(); assertThat(underTest.selectSelectedProjects(dbSession, profile1, null)) @@ -774,17 +774,17 @@ public class QualityProfileDaoIT { @Test public void select_deselected_projects() { - ComponentDto project1 = db.components().insertPrivateProject(t -> t.setName("Project1 name")); - ComponentDto project2 = db.components().insertPrivateProject(t -> t.setName("Project2 name")); - ComponentDto project3 = db.components().insertPrivateProject(t -> t.setName("Project3 name")); + ComponentDto project1 = db.components().insertPrivateProject(t -> t.setName("Project1 name")).getMainBranchComponent(); + ComponentDto project2 = db.components().insertPrivateProject(t -> t.setName("Project2 name")).getMainBranchComponent(); + ComponentDto project3 = db.components().insertPrivateProject(t -> t.setName("Project3 name")).getMainBranchComponent(); QProfileDto profile1 = newQualityProfileDto(); db.qualityProfiles().insert(profile1); - db.qualityProfiles().associateWithProject(db.components().getProjectDto(project1), profile1); + db.qualityProfiles().associateWithProject(db.components().getProjectDtoByMainBranch(project1), profile1); QProfileDto profile2 = newQualityProfileDto(); db.qualityProfiles().insert(profile2); - db.qualityProfiles().associateWithProject(db.components().getProjectDto(project2), profile2); + db.qualityProfiles().associateWithProject(db.components().getProjectDtoByMainBranch(project2), profile2); QProfileDto profile3 = newQualityProfileDto(); assertThat(underTest.selectDeselectedProjects(dbSession, profile1, null)) @@ -799,18 +799,18 @@ public class QualityProfileDaoIT { @Test public void select_project_associations() { - ComponentDto project1 = db.components().insertPrivateProject(t -> t.setName("Project1 name")); - ComponentDto project2 = db.components().insertPrivateProject(t -> t.setName("Project2 name")); - ComponentDto project3 = db.components().insertPrivateProject(t -> t.setName("Project3 name")); + ComponentDto project1 = db.components().insertPrivateProject(t -> t.setName("Project1 name")).getMainBranchComponent(); + ComponentDto project2 = db.components().insertPrivateProject(t -> t.setName("Project2 name")).getMainBranchComponent(); + ComponentDto project3 = db.components().insertPrivateProject(t -> t.setName("Project3 name")).getMainBranchComponent(); db.components().insertProjectBranch(project1, t -> t.setKey("branch")); QProfileDto profile1 = newQualityProfileDto(); db.qualityProfiles().insert(profile1); - db.qualityProfiles().associateWithProject(db.components().getProjectDto(project1), profile1); + db.qualityProfiles().associateWithProject(db.components().getProjectDtoByMainBranch(project1), profile1); QProfileDto profile2 = newQualityProfileDto(); db.qualityProfiles().insert(profile2); - db.qualityProfiles().associateWithProject(db.components().getProjectDto(project2), profile2); + db.qualityProfiles().associateWithProject(db.components().getProjectDtoByMainBranch(project2), profile2); QProfileDto profile3 = newQualityProfileDto(); assertThat(underTest.selectProjectAssociations(dbSession, profile1, null)) @@ -879,7 +879,7 @@ public class QualityProfileDaoIT { @Test public void selectProjectAssociations_shouldFindResult_whenQueryMatchingKey() { - ComponentDto privateProject = db.components().insertPrivateProject(project -> project.setName("project name"), project -> project.setKey("project_key")); + ComponentDto privateProject = db.components().insertPrivateProject(project -> project.setName("project name"), project -> project.setKey("project_key")).getMainBranchComponent(); QProfileDto qProfileDto = db.qualityProfiles().insert(); List results = underTest.selectProjectAssociations(dbSession, qProfileDto, "key"); @@ -889,9 +889,9 @@ public class QualityProfileDaoIT { @Test public void selectSelectedProjects_shouldFindResult_whenQueryMatchingKey() { - ComponentDto privateProject = db.components().insertPrivateProject(project -> project.setName("project name"), project -> project.setKey("project_key")); + ComponentDto privateProject = db.components().insertPrivateProject(project -> project.setName("project name"), project -> project.setKey("project_key")).getMainBranchComponent(); QProfileDto qProfileDto = db.qualityProfiles().insert(); - db.qualityProfiles().associateWithProject(db.components().getProjectDto(privateProject), qProfileDto); + db.qualityProfiles().associateWithProject(db.components().getProjectDtoByMainBranch(privateProject), qProfileDto); List results = underTest.selectSelectedProjects(dbSession, qProfileDto, "key"); @@ -900,7 +900,7 @@ public class QualityProfileDaoIT { @Test public void selectDeselectedProjects_shouldFindResult_whenQueryMatchingKey() { - ComponentDto privateProject = db.components().insertPrivateProject(project -> project.setName("project name"), project -> project.setKey("project_key")); + ComponentDto privateProject = db.components().insertPrivateProject(project -> project.setName("project name"), project -> project.setKey("project_key")).getMainBranchComponent(); QProfileDto qProfileDto = db.qualityProfiles().insert(); List results = underTest.selectDeselectedProjects(dbSession, qProfileDto, "key"); diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/report/RegulatoryReportDaoIT.java b/server/sonar-db-dao/src/it/java/org/sonar/db/report/RegulatoryReportDaoIT.java index c32e3821f9d..6320268a4ed 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/report/RegulatoryReportDaoIT.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/report/RegulatoryReportDaoIT.java @@ -56,7 +56,7 @@ public class RegulatoryReportDaoIT { public void prepare() { rule = db.rules().insertRule(); hotspotRule = db.rules().insertHotspotRule(); - project = db.components().insertPrivateProject(t -> t.setBranchUuid(PROJECT_UUID).setUuid(PROJECT_UUID).setKey(PROJECT_KEY)); + project = db.components().insertPrivateProject(t -> t.setBranchUuid(PROJECT_UUID).setUuid(PROJECT_UUID).setKey(PROJECT_KEY)).getMainBranchComponent(); file = db.components().insertComponent(newFileDto(project).setUuid(FILE_UUID).setKey(FILE_KEY)); } @@ -76,7 +76,7 @@ public class RegulatoryReportDaoIT { // not returned IssueDto issue4 = db.issues().insertIssue(rule, project, file, i -> i.setStatus("CLOSED").setResolution(null)); - ComponentDto otherProject = db.components().insertPrivateProject(); + ComponentDto otherProject = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto otherFile = db.components().insertComponent(newFileDto(otherProject)); IssueDto issue5 = db.issues().insertIssue(rule, otherProject, otherFile); diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/source/FileSourceDaoIT.java b/server/sonar-db-dao/src/it/java/org/sonar/db/source/FileSourceDaoIT.java index d0e4b71e970..301fa88a1da 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/source/FileSourceDaoIT.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/source/FileSourceDaoIT.java @@ -58,7 +58,7 @@ public class FileSourceDaoIT { @Test public void select() { - ComponentDto project = dbTester.components().insertPrivateProject(); + ComponentDto project = dbTester.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); FileSourceDto expected = dbTester.fileSources().insertFileSource(file); @@ -197,7 +197,7 @@ public class FileSourceDaoIT { @Test public void scrollLineHashes_scrolls_hashes_of_specific_keys() { - ComponentDto project = new Random().nextBoolean() ? dbTester.components().insertPrivateProject() : dbTester.components().insertPublicProject(); + ComponentDto project = new Random().nextBoolean() ? dbTester.components().insertPrivateProject().getMainBranchComponent() : dbTester.components().insertPublicProject().getMainBranchComponent(); ComponentDto file1 = dbTester.components().insertComponent(newFileDto(project)); FileSourceDto fileSource1 = dbTester.fileSources().insertFileSource(file1); ComponentDto file2 = dbTester.components().insertComponent(newFileDto(project)); @@ -222,7 +222,7 @@ public class FileSourceDaoIT { @Test public void scrollLineHashes_does_not_scroll_hashes_of_component_without_path() { - ComponentDto project = new Random().nextBoolean() ? dbTester.components().insertPrivateProject() : dbTester.components().insertPublicProject(); + ComponentDto project = new Random().nextBoolean() ? dbTester.components().insertPrivateProject().getMainBranchComponent() : dbTester.components().insertPublicProject().getMainBranchComponent(); ComponentDto file1 = dbTester.components().insertComponent(newFileDto(project)); FileSourceDto fileSource1 = dbTester.fileSources().insertFileSource(file1); ComponentDto file2 = dbTester.components().insertComponent(newFileDto(project).setPath(null)); @@ -235,7 +235,7 @@ public class FileSourceDaoIT { @Test public void scrollFileHashes_handles_scrolling_more_than_1000_files() { - ComponentDto project = dbTester.components().insertPrivateProject(); + ComponentDto project = dbTester.components().insertPrivateProject().getMainBranchComponent(); List files = IntStream.range(0, 1001 + new Random().nextInt(5)) .mapToObj(i -> { ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); @@ -253,7 +253,7 @@ public class FileSourceDaoIT { @Test public void scrollFileHashes_returns_all_hashes() { - ComponentDto project = dbTester.components().insertPrivateProject(); + ComponentDto project = dbTester.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); FileSourceDto inserted = dbTester.fileSources().insertFileSource(file); @@ -272,7 +272,7 @@ public class FileSourceDaoIT { @Test public void scrollLineHashes_handles_scrolling_more_than_1000_files() { - ComponentDto project = new Random().nextBoolean() ? dbTester.components().insertPrivateProject() : dbTester.components().insertPublicProject(); + ComponentDto project = new Random().nextBoolean() ? dbTester.components().insertPrivateProject().getMainBranchComponent() : dbTester.components().insertPublicProject().getMainBranchComponent(); List files = IntStream.range(0, 1001 + new Random().nextInt(5)) .mapToObj(i -> { ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); @@ -318,7 +318,7 @@ public class FileSourceDaoIT { @Test public void update() { - ComponentDto project = dbTester.components().insertPrivateProject(); + ComponentDto project = dbTester.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); FileSourceDto expected = dbTester.fileSources().insertFileSource(file); diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/user/RoleDaoIT.java b/server/sonar-db-dao/src/it/java/org/sonar/db/user/RoleDaoIT.java index 105f2354c48..4f9a1087e16 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/user/RoleDaoIT.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/user/RoleDaoIT.java @@ -52,8 +52,8 @@ public class RoleDaoIT { public void setUp() { user1 = db.users().insertUser(); user2 = db.users().insertUser(); - project1 = db.components().insertPrivateProject(); - project2 = db.components().insertPrivateProject(); + project1 = db.components().insertPrivateProject().getMainBranchComponent(); + project2 = db.components().insertPrivateProject().getMainBranchComponent(); } @Test @@ -113,7 +113,7 @@ public class RoleDaoIT { public void delete_all_group_permissions_by_group_uuid() { GroupDto group1 = db.users().insertGroup(); GroupDto group2 = db.users().insertGroup(); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); db.users().insertPermissionOnGroup(group1, "admin"); db.users().insertProjectPermissionOnGroup(group1, "profileadmin", project); db.users().insertPermissionOnGroup(group1, "gateadmin"); diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/user/UserDismissedMessagesDaoIT.java b/server/sonar-db-dao/src/it/java/org/sonar/db/user/UserDismissedMessagesDaoIT.java index ca83c196ef5..1746aa2cace 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/user/UserDismissedMessagesDaoIT.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/user/UserDismissedMessagesDaoIT.java @@ -42,7 +42,7 @@ public class UserDismissedMessagesDaoIT { @Test public void insert_user_dismissed_message() { - ProjectDto project = db.components().insertPrivateProjectDto(); + ProjectDto project = db.components().insertPrivateProject().getProjectDto(); UserDto user = db.users().insertUser(); UserDismissedMessageDto dto = newDto(project, user); @@ -61,7 +61,7 @@ public class UserDismissedMessagesDaoIT { @Test public void selectByUserAndProjectAndMessageType_returns_object_if_record_found() { UserDto user = db.users().insertUser(); - ProjectDto project = db.components().insertPrivateProjectDto(); + ProjectDto project = db.components().insertPrivateProject().getProjectDto(); db.users().insertUserDismissedMessage(user, project, CeTaskMessageType.GENERIC); Optional result = underTest.selectByUserAndProjectAndMessageType(db.getSession(), user, project, CeTaskMessageType.GENERIC); @@ -75,7 +75,7 @@ public class UserDismissedMessagesDaoIT { @Test public void selectByUserAndProjectAndMessageType_returns_absent_if_no_record_found() { UserDto user = db.users().insertUser(); - ProjectDto project = db.components().insertPrivateProjectDto(); + ProjectDto project = db.components().insertPrivateProject().getProjectDto(); db.users().insertUserDismissedMessage(user, project, CeTaskMessageType.GENERIC); Optional result = underTest.selectByUserAndProjectAndMessageType(db.getSession(), user, project, SUGGEST_DEVELOPER_EDITION_UPGRADE); @@ -87,8 +87,8 @@ public class UserDismissedMessagesDaoIT { public void selectByUserUuid_returns_all_dismissed_messages_of_a_user() { UserDto user1 = db.users().insertUser(); UserDto user2 = db.users().insertUser(); - ProjectDto project1 = db.components().insertPrivateProjectDto(); - ProjectDto project2 = db.components().insertPrivateProjectDto(); + ProjectDto project1 = db.components().insertPrivateProject().getProjectDto(); + ProjectDto project2 = db.components().insertPrivateProject().getProjectDto(); db.users().insertUserDismissedMessage(user1, project1, CeTaskMessageType.GENERIC); db.users().insertUserDismissedMessage(user1, project2, CeTaskMessageType.GENERIC); UserDismissedMessageDto dto1 = db.users().insertUserDismissedMessage(user2, project1, CeTaskMessageType.GENERIC); @@ -108,8 +108,8 @@ public class UserDismissedMessagesDaoIT { public void deleteByUserUuid_removes_dismiss_warning_data_of_a_user() { UserDto user1 = db.users().insertUser(); UserDto user2 = db.users().insertUser(); - ProjectDto project1 = db.components().insertPrivateProjectDto(); - ProjectDto project2 = db.components().insertPrivateProjectDto(); + ProjectDto project1 = db.components().insertPrivateProject().getProjectDto(); + ProjectDto project2 = db.components().insertPrivateProject().getProjectDto(); db.users().insertUserDismissedMessage(user1, project1, CeTaskMessageType.GENERIC); db.users().insertUserDismissedMessage(user1, project2, CeTaskMessageType.GENERIC); db.users().insertUserDismissedMessage(user2, project1, CeTaskMessageType.GENERIC); @@ -125,8 +125,8 @@ public class UserDismissedMessagesDaoIT { public void deleteByUserUuid_removes_dismissed_messages_of_that_type() { UserDto user1 = db.users().insertUser(); UserDto user2 = db.users().insertUser(); - ProjectDto project1 = db.components().insertPrivateProjectDto(); - ProjectDto project2 = db.components().insertPrivateProjectDto(); + ProjectDto project1 = db.components().insertPrivateProject().getProjectDto(); + ProjectDto project2 = db.components().insertPrivateProject().getProjectDto(); UserDismissedMessageDto dto1 = db.users().insertUserDismissedMessage(user1, project1, CeTaskMessageType.GENERIC); db.users().insertUserDismissedMessage(user1, project2, SUGGEST_DEVELOPER_EDITION_UPGRADE); db.users().insertUserDismissedMessage(user2, project1, SUGGEST_DEVELOPER_EDITION_UPGRADE); diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/user/UserTokenDaoIT.java b/server/sonar-db-dao/src/it/java/org/sonar/db/user/UserTokenDaoIT.java index f3c653ae3a8..8d8818d9d22 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/user/UserTokenDaoIT.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/user/UserTokenDaoIT.java @@ -69,7 +69,7 @@ public class UserTokenDaoIT { @Test public void insert_project_analysis_token() { UserTokenDto projectAnalysisToken = newProjectAnalysisToken(); - ComponentDto project = db.components().insertPublicProject(projectAnalysisToken.getProjectUuid()); + ComponentDto project = db.components().insertPublicProject(projectAnalysisToken.getProjectUuid()).getMainBranchComponent(); underTest.insert(db.getSession(), projectAnalysisToken, "login"); UserTokenDto projectAnalysisTokenFromDb = underTest.selectByTokenHash(db.getSession(), projectAnalysisToken.getTokenHash()); diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/webhook/WebhookDaoIT.java b/server/sonar-db-dao/src/it/java/org/sonar/db/webhook/WebhookDaoIT.java index f269317fa82..d957f15bb4e 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/webhook/WebhookDaoIT.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/webhook/WebhookDaoIT.java @@ -52,7 +52,7 @@ public class WebhookDaoIT { @Test public void select_global_webhooks() { - ProjectDto projectDto = componentDbTester.insertPrivateProjectDto(); + ProjectDto projectDto = componentDbTester.insertPrivateProject().getProjectDto(); webhookDbTester.insertGlobalWebhook(); webhookDbTester.insertGlobalWebhook(); webhookDbTester.insertWebhook(projectDto); @@ -65,7 +65,7 @@ public class WebhookDaoIT { @Test public void select_global_webhooks_returns_empty_list_if_there_are_no_global_webhooks() { - ProjectDto projectDto = componentDbTester.insertPrivateProjectDto(); + ProjectDto projectDto = componentDbTester.insertPrivateProject().getProjectDto(); webhookDbTester.insertWebhook(projectDto); webhookDbTester.insertWebhook(projectDto); @@ -163,7 +163,7 @@ public class WebhookDaoIT { @Test public void cleanWebhooksOfAProject() { - ProjectDto projectDto = componentDbTester.insertPrivateProjectDto(); + ProjectDto projectDto = componentDbTester.insertPrivateProject().getProjectDto(); webhookDbTester.insertWebhook(projectDto); webhookDbTester.insertWebhook(projectDto); webhookDbTester.insertWebhook(projectDto); diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/webhook/WebhookDaoWithPersisterIT.java b/server/sonar-db-dao/src/it/java/org/sonar/db/webhook/WebhookDaoWithPersisterIT.java index 2a896fce3f0..e15a51fb577 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/webhook/WebhookDaoWithPersisterIT.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/webhook/WebhookDaoWithPersisterIT.java @@ -158,8 +158,8 @@ public class WebhookDaoWithPersisterIT { @Test public void deleteProjectWebhooksIsPersisted() { - ProjectDto projectDto = componentDbTester.insertPrivateProjectDto(p -> - p.setUuid("puuid").setName("pname").setKey("pkey")); + ProjectDto projectDto = componentDbTester.insertPrivateProject(p -> + p.setUuid("puuid").setName("pname").setKey("pkey")).getProjectDto(); webhookDbTester.insertWebhook(projectDto); underTest.deleteByProject(dbSession, projectDto); @@ -175,7 +175,7 @@ public class WebhookDaoWithPersisterIT { @Test public void deleteProjectWebhooksWithoutAffectedRowsIsNotPersisted() { - ProjectDto projectDto = componentDbTester.insertPrivateProjectDto(p -> p.setUuid("puuid").setName("pname")); + ProjectDto projectDto = componentDbTester.insertPrivateProject(p -> p.setUuid("puuid").setName("pname")).getProjectDto(); underTest.deleteByProject(dbSession, projectDto); diff --git a/server/sonar-db-dao/src/testFixtures/java/org/sonar/db/component/ComponentDbTester.java b/server/sonar-db-dao/src/testFixtures/java/org/sonar/db/component/ComponentDbTester.java index 1c685092340..3ebee457ea1 100644 --- a/server/sonar-db-dao/src/testFixtures/java/org/sonar/db/component/ComponentDbTester.java +++ b/server/sonar-db-dao/src/testFixtures/java/org/sonar/db/component/ComponentDbTester.java @@ -24,6 +24,7 @@ import java.util.function.Consumer; import javax.annotation.Nullable; import org.sonar.api.resources.Qualifiers; import org.sonar.api.utils.System2; +import org.sonar.core.util.Uuids; import org.sonar.db.DbClient; import org.sonar.db.DbSession; import org.sonar.db.DbTester; @@ -41,11 +42,17 @@ public class ComponentDbTester { private final DbTester db; private final DbClient dbClient; private final DbSession dbSession; + private final boolean useDifferentUuids; public ComponentDbTester(DbTester db) { + this(db, false); + } + + public ComponentDbTester(DbTester db, boolean useDifferentProjectUuids) { this.db = db; this.dbClient = db.getDbClient(); this.dbSession = db.getSession(); + this.useDifferentUuids = useDifferentProjectUuids; } public SnapshotDto insertProjectAndSnapshot(ComponentDto component) { @@ -62,7 +69,7 @@ public class ComponentDbTester { return insertComponentImpl(component, null, defaults()); } - public ComponentDto insertPrivateProject() { + public ProjectData insertPrivateProject() { return insertComponentAndBranchAndProject(ComponentTesting.newPrivateProjectDto(), true, defaults(), defaults(), defaults()); } @@ -72,8 +79,8 @@ public class ComponentDbTester { .orElseThrow(() -> new IllegalStateException("Project has invalid configuration")); } - public ProjectDto getProjectDto(ComponentDto project) { - return db.getDbClient().projectDao().selectByUuid(dbSession, project.uuid()) + public ProjectDto getProjectDtoByMainBranch(ComponentDto mainBranch) { + return db.getDbClient().projectDao().selectByBranchUuid(dbSession, mainBranch.uuid()) .orElseThrow(() -> new IllegalStateException("Project has invalid configuration")); } @@ -87,79 +94,49 @@ public class ComponentDbTester { .orElseThrow(() -> new IllegalStateException("Can't find branch")); } - public ComponentDto insertPrivateProject(ComponentDto componentDto) { + public ProjectData insertPrivateProject(ComponentDto componentDto) { return insertComponentAndBranchAndProject(componentDto, true); } - public ComponentDto insertPublicProject() { + public ProjectData insertPublicProject() { return insertComponentAndBranchAndProject(ComponentTesting.newPublicProjectDto(), false); } - public ComponentDto insertPublicProject(String uuid) { + public ProjectData insertPublicProject(String uuid) { return insertComponentAndBranchAndProject(ComponentTesting.newPublicProjectDto(uuid), false); } - public ComponentDto insertPublicProject(String uuid, Consumer dtoPopulator) { + public ProjectData insertPublicProject(String uuid, Consumer dtoPopulator) { return insertComponentAndBranchAndProject(ComponentTesting.newPublicProjectDto(uuid), false, defaults(), dtoPopulator); } - public ComponentDto insertPublicProject(ComponentDto componentDto) { + public ProjectData insertPublicProject(ComponentDto componentDto) { return insertComponentAndBranchAndProject(componentDto, false); } - public ComponentDto insertPrivateProject(String uuid) { + public ProjectData insertPrivateProject(String uuid) { return insertComponentAndBranchAndProject(ComponentTesting.newPrivateProjectDto(uuid), true); } - public final ComponentDto insertPrivateProject(Consumer dtoPopulator) { + public final ProjectData insertPrivateProject(Consumer dtoPopulator) { return insertComponentAndBranchAndProject(ComponentTesting.newPrivateProjectDto(), true, defaults(), dtoPopulator); } - public final ComponentDto insertPrivateProject(Consumer componentDtoPopulator, Consumer projectDtoPopulator) { + public final ProjectData insertPrivateProject(Consumer componentDtoPopulator, Consumer projectDtoPopulator) { return insertComponentAndBranchAndProject(ComponentTesting.newPrivateProjectDto(), true, defaults(), componentDtoPopulator, projectDtoPopulator); } - public final ComponentDto insertPublicProject(Consumer dtoPopulator) { + public final ProjectData insertPublicProject(Consumer dtoPopulator) { return insertComponentAndBranchAndProject(ComponentTesting.newPublicProjectDto(), false, defaults(), dtoPopulator); } - public final ComponentDto insertPublicProject(Consumer componentDtoPopulator, Consumer projectDtoPopulator) { + public final ProjectData insertPublicProject(Consumer componentDtoPopulator, Consumer projectDtoPopulator) { return insertComponentAndBranchAndProject(ComponentTesting.newPublicProjectDto(), false, defaults(), componentDtoPopulator, projectDtoPopulator); } - public ProjectDto insertPublicProjectDto() { - ComponentDto componentDto = insertPublicProject(); - return getProjectDto(componentDto); - } - - public ProjectDto insertPrivateProjectDto() { - ComponentDto componentDto = insertPrivateProject(); - return getProjectDto(componentDto); - } - - public ProjectDto insertPublicProjectDto(Consumer dtoPopulator) { - ComponentDto componentDto = insertPublicProject(dtoPopulator); - return getProjectDto(componentDto); - } - - public final ProjectDto insertPrivateProjectDto(String uuid) { - ComponentDto componentDto = insertPrivateProject(uuid); - return getProjectDto(componentDto); - } - - public final ProjectDto insertPrivateProjectDto(Consumer componentDtoPopulator) { - return insertPrivateProjectDto(componentDtoPopulator, defaults()); - } - - public final ProjectDto insertPrivateProjectDto(Consumer componentDtoPopulator, Consumer projectDtoPopulator) { - ComponentDto componentDto = insertPrivateProject(componentDtoPopulator, projectDtoPopulator); - return getProjectDto(componentDto); - } - - public ProjectDto insertPrivateProjectDto(Consumer branchPopulator, Consumer componentDtoPopulator, Consumer projectDtoPopulator) { - ComponentDto componentDto = insertPrivateProjectWithCustomBranch(branchPopulator, componentDtoPopulator, projectDtoPopulator); - return getProjectDto(componentDto); + public ProjectData insertPrivateProject(Consumer branchPopulator, Consumer componentDtoPopulator, Consumer projectDtoPopulator) { + return insertPrivateProjectWithCustomBranch(branchPopulator, componentDtoPopulator, projectDtoPopulator); } public final ComponentDto insertFile(ProjectDto project) { @@ -172,23 +149,23 @@ public class ComponentDbTester { return insertComponent(ComponentTesting.newFileDto(projectComponent)); } - public final ComponentDto insertPrivateProject(String uuid, Consumer dtoPopulator) { + public final ProjectData insertPrivateProject(String uuid, Consumer dtoPopulator) { return insertComponentAndBranchAndProject(ComponentTesting.newPrivateProjectDto(uuid), true, defaults(), dtoPopulator); } - public final ComponentDto insertPrivateProjectWithCustomBranch(String branchKey) { + public final ProjectData insertPrivateProjectWithCustomBranch(String branchKey) { return insertPrivateProjectWithCustomBranch(b -> b.setBranchType(BRANCH).setKey(branchKey), defaults()); } - public final ComponentDto insertPrivateProjectWithCustomBranch(Consumer branchPopulator, Consumer componentPopulator) { + public final ProjectData insertPrivateProjectWithCustomBranch(Consumer branchPopulator, Consumer componentPopulator) { return insertComponentAndBranchAndProject(ComponentTesting.newPrivateProjectDto(), true, branchPopulator, componentPopulator); } - public final ComponentDto insertPublicProjectWithCustomBranch(Consumer branchPopulator, Consumer componentPopulator) { + public final ProjectData insertPublicProjectWithCustomBranch(Consumer branchPopulator, Consumer componentPopulator) { return insertComponentAndBranchAndProject(ComponentTesting.newPublicProjectDto(), false, branchPopulator, componentPopulator); } - public final ComponentDto insertPrivateProjectWithCustomBranch(Consumer branchPopulator, Consumer componentPopulator, + public final ProjectData insertPrivateProjectWithCustomBranch(Consumer branchPopulator, Consumer componentPopulator, Consumer projectPopulator) { return insertComponentAndBranchAndProject(ComponentTesting.newPrivateProjectDto(), true, branchPopulator, componentPopulator, projectPopulator); } @@ -350,43 +327,23 @@ public class ComponentDbTester { db.commit(); } - public final ComponentDto insertPublicApplication() { + public final ProjectData insertPublicApplication() { return insertPublicApplication(defaults()); } - public final ComponentDto insertPublicApplication(Consumer dtoPopulator) { + public final ProjectData insertPublicApplication(Consumer dtoPopulator) { return insertComponentAndBranchAndProject(ComponentTesting.newApplication().setPrivate(false), false, defaults(), dtoPopulator); } - public final ProjectDto insertPrivateApplicationDto() { - return getProjectDto(insertPrivateApplication()); - } - - public final ProjectDto insertPublicApplicationDto() { - return getProjectDto(insertPublicApplication()); - } - - public final ProjectDto insertPublicApplicationDto(Consumer dtoPopulator) { - return getProjectDto(insertPublicApplication(dtoPopulator)); - } - - public final ProjectDto insertPrivateApplicationDto(Consumer dtoPopulator) { - return getProjectDto(insertPrivateApplication(dtoPopulator, defaults())); - } - - public final ProjectDto insertPrivateApplicationDto(Consumer dtoPopulator, Consumer appPopulator) { - return getProjectDto(insertPrivateApplication(dtoPopulator, appPopulator)); - } - - public final ComponentDto insertPrivateApplication(Consumer dtoPopulator) { + public final ProjectData insertPrivateApplication(Consumer dtoPopulator) { return insertPrivateApplication(dtoPopulator, defaults()); } - public final ComponentDto insertPrivateApplication() { + public final ProjectData insertPrivateApplication() { return insertPrivateApplication(defaults(), defaults()); } - public final ComponentDto insertPrivateApplication(Consumer dtoPopulator, Consumer projectPopulator) { + public final ProjectData insertPrivateApplication(Consumer dtoPopulator, Consumer projectPopulator) { return insertComponentAndBranchAndProject(ComponentTesting.newApplication().setPrivate(true), true, defaults(), dtoPopulator, projectPopulator); } @@ -404,22 +361,22 @@ public class ComponentDbTester { db.commit(); } - private ComponentDto insertComponentAndBranchAndProject(ComponentDto component, @Nullable Boolean isPrivate, Consumer branchPopulator, + private ProjectData insertComponentAndBranchAndProject(ComponentDto component, @Nullable Boolean isPrivate, Consumer branchPopulator, Consumer componentDtoPopulator, Consumer projectDtoPopulator) { insertComponentImpl(component, isPrivate, componentDtoPopulator); - ProjectDto projectDto = toProjectDto(component, System2.INSTANCE.now()); + ProjectDto projectDto = toProjectDto(component, System2.INSTANCE.now(), useDifferentUuids); projectDtoPopulator.accept(projectDto); dbClient.projectDao().insert(dbSession, projectDto); - BranchDto branchDto = ComponentTesting.newMainBranchDto(component); + BranchDto branchDto = ComponentTesting.newMainBranchDto(component, projectDto.getUuid()); branchDto.setExcludeFromPurge(true); branchPopulator.accept(branchDto); branchDto.setIsMain(true); dbClient.branchDao().insert(dbSession, branchDto); db.commit(); - return component; + return new ProjectData(getProjectDtoByMainBranch(component), branchDto, component); } public void addApplicationProject(ComponentDto application, ComponentDto... projects) { @@ -450,16 +407,16 @@ public class ComponentDbTester { db.commit(); } - private ComponentDto insertComponentAndBranchAndProject(ComponentDto component, @Nullable Boolean isPrivate, Consumer branchPopulator, + private ProjectData insertComponentAndBranchAndProject(ComponentDto component, @Nullable Boolean isPrivate, Consumer branchPopulator, Consumer componentDtoPopulator) { return insertComponentAndBranchAndProject(component, isPrivate, branchPopulator, componentDtoPopulator, defaults()); } - private ComponentDto insertComponentAndBranchAndProject(ComponentDto component, @Nullable Boolean isPrivate, Consumer branchPopulator) { + private ProjectData insertComponentAndBranchAndProject(ComponentDto component, @Nullable Boolean isPrivate, Consumer branchPopulator) { return insertComponentAndBranchAndProject(component, isPrivate, branchPopulator, defaults()); } - private ComponentDto insertComponentAndBranchAndProject(ComponentDto component, @Nullable Boolean isPrivate) { + private ProjectData insertComponentAndBranchAndProject(ComponentDto component, @Nullable Boolean isPrivate) { return insertComponentAndBranchAndProject(component, isPrivate, defaults()); } @@ -552,8 +509,12 @@ public class ComponentDbTester { // TODO temporary constructor to quickly create project from previous project component. public static ProjectDto toProjectDto(ComponentDto componentDto, long createTime) { + return toProjectDto(componentDto, createTime, false); + } + + public static ProjectDto toProjectDto(ComponentDto componentDto, long createTime, boolean useDifferentProjectUuids) { return new ProjectDto() - .setUuid(componentDto.uuid()) + .setUuid(useDifferentProjectUuids ? Uuids.createFast() : componentDto.uuid()) .setKey(componentDto.getKey()) .setQualifier(componentDto.qualifier() != null ? componentDto.qualifier() : Qualifiers.PROJECT) .setCreatedAt(createTime) @@ -580,4 +541,29 @@ public class ComponentDbTester { return t -> { }; } + + public class ProjectData { + private final BranchDto mainBranchDto; + private final ComponentDto mainBranchComponent; + private final ProjectDto projectDto; + + + public ProjectData(ProjectDto projectDto, BranchDto mainBranchDto, ComponentDto mainBranchComponent) { + this.mainBranchDto = mainBranchDto; + this.mainBranchComponent = mainBranchComponent; + this.projectDto = projectDto; + } + + public ComponentDto getMainBranchComponent() { + return mainBranchComponent; + } + + public ProjectDto getProjectDto() { + return projectDto; + } + + public BranchDto getMainBranchDto() { + return mainBranchDto; + } + } } diff --git a/server/sonar-db-dao/src/testFixtures/java/org/sonar/db/component/ComponentTesting.java b/server/sonar-db-dao/src/testFixtures/java/org/sonar/db/component/ComponentTesting.java index fd7176c80e7..cc165d1b7c2 100644 --- a/server/sonar-db-dao/src/testFixtures/java/org/sonar/db/component/ComponentTesting.java +++ b/server/sonar-db-dao/src/testFixtures/java/org/sonar/db/component/ComponentTesting.java @@ -232,12 +232,12 @@ public class ComponentTesting { .setBranchType(branchType); } - public static BranchDto newMainBranchDto(ComponentDto branchComponent) { + public static BranchDto newMainBranchDto(ComponentDto branchComponent, String projectUUid) { return new BranchDto() .setKey(DEFAULT_MAIN_BRANCH_NAME) .setIsMain(true) .setUuid(branchComponent.uuid()) - .setProjectUuid(branchComponent.uuid()) + .setProjectUuid(projectUUid) .setBranchType(BranchType.BRANCH); } diff --git a/server/sonar-db-dao/src/testFixtures/java/org/sonar/db/issue/IssueDbTester.java b/server/sonar-db-dao/src/testFixtures/java/org/sonar/db/issue/IssueDbTester.java index d06e61c8e07..361994ac3f1 100644 --- a/server/sonar-db-dao/src/testFixtures/java/org/sonar/db/issue/IssueDbTester.java +++ b/server/sonar-db-dao/src/testFixtures/java/org/sonar/db/issue/IssueDbTester.java @@ -67,7 +67,7 @@ public class IssueDbTester { @SafeVarargs public final IssueDto insert(Consumer... populators) { RuleDto rule = db.rules().insert(); - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); IssueDto issue = newIssue(rule, project, file); stream(populators).forEach(p -> p.accept(issue)); @@ -136,7 +136,7 @@ public class IssueDbTester { */ @SafeVarargs public final IssueDto insertIssue(RuleDto ruleDto, Consumer... populators) { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); IssueDto issue = newIssue(ruleDto, project, file) .setType(RULE_TYPES_EXCEPT_HOTSPOTS[new Random().nextInt(RULE_TYPES_EXCEPT_HOTSPOTS.length)]); @@ -203,7 +203,7 @@ public class IssueDbTester { @SafeVarargs public final IssueDto insertHotspot(Consumer... populators) { RuleDto rule = db.rules().insertHotspotRule(); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); IssueDto issue = newIssue(rule, project, file) .setType(SECURITY_HOTSPOT) diff --git a/server/sonar-server-common/src/it/java/org/sonar/server/component/index/ComponentIndexerIT.java b/server/sonar-server-common/src/it/java/org/sonar/server/component/index/ComponentIndexerIT.java index eda1f4e137e..c8889b328e7 100644 --- a/server/sonar-server-common/src/it/java/org/sonar/server/component/index/ComponentIndexerIT.java +++ b/server/sonar-server-common/src/it/java/org/sonar/server/component/index/ComponentIndexerIT.java @@ -75,8 +75,8 @@ public class ComponentIndexerIT { @Test public void indexOnStartup_indexes_all_components() { - ComponentDto project1 = db.components().insertPrivateProject(); - ComponentDto project2 = db.components().insertPrivateProject(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); underTest.indexOnStartup(emptySet()); @@ -85,8 +85,8 @@ public class ComponentIndexerIT { @Test public void indexOAll_indexes_all_components() { - ComponentDto project1 = db.components().insertPrivateProject(); - ComponentDto project2 = db.components().insertPrivateProject(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); underTest.indexAll(); @@ -95,7 +95,7 @@ public class ComponentIndexerIT { @Test public void map_fields() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); underTest.indexOnStartup(emptySet()); @@ -109,7 +109,7 @@ public class ComponentIndexerIT { @Test public void indexOnStartup_does_not_index_non_main_branches() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto branch = db.components().insertProjectBranch(project, b -> b.setKey("feature/foo")); underTest.indexOnStartup(emptySet()); @@ -119,7 +119,7 @@ public class ComponentIndexerIT { @Test public void indexOnAnalysis_indexes_project() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); underTest.indexOnAnalysis(project.uuid()); @@ -128,7 +128,7 @@ public class ComponentIndexerIT { @Test public void indexOnAnalysis_indexes_new_components() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); underTest.indexOnAnalysis(project.uuid()); assertThatIndexContainsOnly(project); @@ -138,7 +138,7 @@ public class ComponentIndexerIT { @Test public void indexOnAnalysis_updates_index_on_changes() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); underTest.indexOnAnalysis(project.uuid()); assertThatComponentHasName(project, project.name()); @@ -154,7 +154,7 @@ public class ComponentIndexerIT { @Test public void indexOnAnalysis_does_not_index_non_main_branches() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto branch = db.components().insertProjectBranch(project, b -> b.setKey("feature/foo")); underTest.indexOnAnalysis(branch.uuid()); @@ -164,7 +164,7 @@ public class ComponentIndexerIT { @Test public void do_not_update_index_on_project_tag_update() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); indexProject(project, ProjectIndexer.Cause.PROJECT_TAGS_UPDATE); @@ -173,7 +173,7 @@ public class ComponentIndexerIT { @Test public void do_not_update_index_on_permission_change() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); indexProject(project, ProjectIndexer.Cause.PERMISSION_CHANGE); @@ -182,7 +182,7 @@ public class ComponentIndexerIT { @Test public void update_index_on_project_creation() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); IndexingResult result = indexProject(project, PROJECT_CREATION); @@ -193,7 +193,7 @@ public class ComponentIndexerIT { @Test public void delete_some_components() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); indexProject(project, PROJECT_CREATION); underTest.delete(project.uuid(), emptySet()); @@ -203,7 +203,7 @@ public class ComponentIndexerIT { @Test public void delete_project() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); indexProject(project, PROJECT_CREATION); assertThatIndexHasSize(1); @@ -215,7 +215,7 @@ public class ComponentIndexerIT { @Test public void errors_during_indexing_are_recovered() { - ComponentDto project1 = db.components().insertPrivateProject(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); es.lockWrites(TYPE_COMPONENT); IndexingResult result = indexProject(project1, PROJECT_CREATION); diff --git a/server/sonar-server-common/src/it/java/org/sonar/server/favorite/FavoriteUpdaterIT.java b/server/sonar-server-common/src/it/java/org/sonar/server/favorite/FavoriteUpdaterIT.java index 8a7c4ae8498..82a496a830c 100644 --- a/server/sonar-server-common/src/it/java/org/sonar/server/favorite/FavoriteUpdaterIT.java +++ b/server/sonar-server-common/src/it/java/org/sonar/server/favorite/FavoriteUpdaterIT.java @@ -44,7 +44,7 @@ public class FavoriteUpdaterIT { @Test public void put_favorite() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); UserDto user = db.users().insertUser(); assertNoFavorite(project, user); @@ -55,7 +55,7 @@ public class FavoriteUpdaterIT { @Test public void do_nothing_when_no_user() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); underTest.add(dbSession, project, null, null,true); @@ -67,11 +67,11 @@ public class FavoriteUpdaterIT { @Test public void do_not_add_favorite_when_already_100_favorite_projects() { UserDto user = db.users().insertUser(); - IntStream.rangeClosed(1, 100).forEach(i -> db.favorites().add(db.components().insertPrivateProject(), user.getUuid(), user.getName())); + IntStream.rangeClosed(1, 100).forEach(i -> db.favorites().add(db.components().insertPrivateProject().getMainBranchComponent(), user.getUuid(), user.getName())); assertThat(dbClient.propertiesDao().selectByQuery(PropertyQuery.builder() .setUserUuid(user.getUuid()) .build(), dbSession)).hasSize(100); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); underTest.add(dbSession, project, user.getUuid(), user.getLogin(), false); @@ -83,12 +83,12 @@ public class FavoriteUpdaterIT { @Test public void do_not_add_favorite_when_already_100_favorite_portfolios() { UserDto user = db.users().insertUser(); - IntStream.rangeClosed(1, 100).forEach(i -> db.favorites().add(db.components().insertPrivateProject(), + IntStream.rangeClosed(1, 100).forEach(i -> db.favorites().add(db.components().insertPrivateProject().getMainBranchComponent(), user.getUuid(), user.getLogin())); assertThat(dbClient.propertiesDao().selectByQuery(PropertyQuery.builder() .setUserUuid(user.getUuid()) .build(), dbSession)).hasSize(100); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); underTest.add(dbSession, project, user.getUuid(), user.getLogin(), false); @@ -100,9 +100,9 @@ public class FavoriteUpdaterIT { @Test public void fail_when_more_than_100_projects_favorites() { UserDto user = db.users().insertUser(); - IntStream.rangeClosed(1, 100).forEach(i -> db.favorites().add(db.components().insertPrivateProject(), + IntStream.rangeClosed(1, 100).forEach(i -> db.favorites().add(db.components().insertPrivateProject().getMainBranchComponent(), user.getUuid(), user.getLogin())); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); assertThatThrownBy(() -> underTest.add(dbSession, project, user.getUuid(), user.getLogin(), true)) .isInstanceOf(IllegalArgumentException.class) @@ -111,7 +111,7 @@ public class FavoriteUpdaterIT { @Test public void fail_when_adding_existing_favorite() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); UserDto user = db.users().insertUser(); underTest.add(dbSession, project, user.getUuid(), user.getLogin(), true); assertFavorite(project, user); diff --git a/server/sonar-server-common/src/it/java/org/sonar/server/issue/index/IssueIndexerIT.java b/server/sonar-server-common/src/it/java/org/sonar/server/issue/index/IssueIndexerIT.java index ed038aef32c..6a131ee875e 100644 --- a/server/sonar-server-common/src/it/java/org/sonar/server/issue/index/IssueIndexerIT.java +++ b/server/sonar-server-common/src/it/java/org/sonar/server/issue/index/IssueIndexerIT.java @@ -108,7 +108,7 @@ public class IssueIndexerIT { @Test public void verify_indexed_fields() { RuleDto rule = db.rules().insert(); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto dir = db.components().insertComponent(ComponentTesting.newDirectory(project, "src/main/java/foo")); ComponentDto file = db.components().insertComponent(newFileDto(project, dir, "F1")); IssueDto issue = db.issues().insert(rule, project, file); @@ -142,7 +142,7 @@ public class IssueIndexerIT { @Test public void verify_security_standards_indexation() { RuleDto rule = db.rules().insert(r -> r.setSecurityStandards(new HashSet<>(Arrays.asList("cwe:123", "owaspTop10:a3", "cwe:863", "owaspAsvs-4.0:2.1.1")))); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto dir = db.components().insertComponent(ComponentTesting.newDirectory(project, "src/main/java/foo")); ComponentDto file = db.components().insertComponent(newFileDto(project, dir, "F1")); db.issues().insert(rule, project, file); @@ -173,10 +173,10 @@ public class IssueIndexerIT { @Test public void indexOnAnalysis_indexes_the_issues_of_project() { RuleDto rule = db.rules().insert(); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); IssueDto issue = db.issues().insert(rule, project, file); - ComponentDto otherProject = db.components().insertPrivateProject(); + ComponentDto otherProject = db.components().insertPrivateProject().getMainBranchComponent(); db.components().insertComponent(newFileDto(otherProject)); underTest.indexOnAnalysis(project.uuid()); @@ -187,7 +187,7 @@ public class IssueIndexerIT { @Test public void indexOnAnalysis_does_not_delete_orphan_docs() { RuleDto rule = db.rules().insert(); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); IssueDto issue = db.issues().insert(rule, project, file); @@ -290,7 +290,7 @@ public class IssueIndexerIT { @Test public void commitAndIndexIssues_commits_db_transaction_and_adds_issues_to_index() { RuleDto rule = db.rules().insert(); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); // insert issues in db without committing @@ -323,7 +323,7 @@ public class IssueIndexerIT { @Test public void indexing_errors_during_commitAndIndexIssues_are_recovered() { RuleDto rule = db.rules().insert(); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); // insert issues in db without committing @@ -391,7 +391,7 @@ public class IssueIndexerIT { @Test public void indexing_recovers_multiple_errors_on_the_same_project() { RuleDto rule = db.rules().insert(); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); db.issues().insert(rule, project, file); db.issues().insert(rule, project, file); @@ -479,7 +479,7 @@ public class IssueIndexerIT { @Test public void index_issue_in_non_main_branch() { RuleDto rule = db.rules().insert(); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto branch = db.components().insertProjectBranch(project, b -> b.setKey("feature/foo")); BranchDto branchDto = db.getDbClient().branchDao().selectByUuid(db.getSession(), branch.uuid()).orElseThrow(); ComponentDto dir = db.components().insertComponent(ComponentTesting.newDirectory(branch, "src/main/java/foo")); @@ -500,7 +500,7 @@ public class IssueIndexerIT { @Test public void issue_on_test_file_has_test_scope() { RuleDto rule = db.rules().insert(); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto dir = db.components().insertComponent(ComponentTesting.newDirectory(project, "src/main/java/foo")); ComponentDto file = db.components().insertComponent(newFileDto(project, dir, "F1").setQualifier("UTS")); IssueDto issue = db.issues().insert(rule, project, file); @@ -516,7 +516,7 @@ public class IssueIndexerIT { @Test public void issue_on_directory_has_main_code_scope() { RuleDto rule = db.rules().insert(); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto dir = db.components().insertComponent(ComponentTesting.newDirectory(project, "src/main/java/foo")); IssueDto issue = db.issues().insert(rule, project, dir); @@ -531,7 +531,7 @@ public class IssueIndexerIT { @Test public void issue_on_project_has_main_code_scope() { RuleDto rule = db.rules().insert(); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); IssueDto issue = db.issues().insert(rule, project, project); underTest.indexAllIssues(); @@ -550,7 +550,7 @@ public class IssueIndexerIT { @Test public void indexOnAnalysis_whenChangedComponents_shouldReindexOnlyChangedComponents() { RuleDto rule = db.rules().insert(); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto changedComponent1 = db.components().insertComponent(newFileDto(project)); ComponentDto unchangedComponent = db.components().insertComponent(newFileDto(project)); ComponentDto ChangedComponent2 = db.components().insertComponent(newFileDto(project)); @@ -568,7 +568,7 @@ public class IssueIndexerIT { @Test public void indexOnAnalysis_whenEmptyUnchangedComponents_shouldReindexEverything() { RuleDto rule = db.rules().insert(); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto changedComponent = db.components().insertComponent(newFileDto(project)); IssueDto changedIssue1 = db.issues().insert(rule, project, changedComponent); IssueDto changedIssue2 = db.issues().insert(rule, project, changedComponent); @@ -581,7 +581,7 @@ public class IssueIndexerIT { @Test public void indexOnAnalysis_whenChangedComponentWithoutIssue_shouldReindexNothing() { db.rules().insert(); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); db.components().insertComponent(newFileDto(project)); underTest.indexOnAnalysis(project.uuid(), Set.of()); diff --git a/server/sonar-server-common/src/it/java/org/sonar/server/issue/index/IssueIteratorFactoryIT.java b/server/sonar-server-common/src/it/java/org/sonar/server/issue/index/IssueIteratorFactoryIT.java index 594b876f405..cb16c2e28f3 100644 --- a/server/sonar-server-common/src/it/java/org/sonar/server/issue/index/IssueIteratorFactoryIT.java +++ b/server/sonar-server-common/src/it/java/org/sonar/server/issue/index/IssueIteratorFactoryIT.java @@ -46,7 +46,7 @@ public class IssueIteratorFactoryIT { @Test public void iterator_over_one_issue() { RuleDto rule = dbTester.rules().insert(); - ComponentDto project = dbTester.components().insertPrivateProject(); + ComponentDto project = dbTester.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = dbTester.components().insertComponent(newFileDto(project) .setPath("src/main/java/Action.java")); IssueDto expected = dbTester.issues().insert(rule, project, file, @@ -95,7 +95,7 @@ public class IssueIteratorFactoryIT { @Test public void iterator_over_issues() { RuleDto rule = dbTester.rules().insert(); - ComponentDto project = dbTester.components().insertPrivateProject(); + ComponentDto project = dbTester.components().insertPrivateProject().getMainBranchComponent(); ComponentDto directory = dbTester.components().insertComponent(newDirectory(project, "src/main/java")); ComponentDto file = dbTester.components().insertComponent(newFileDto(directory, directory) .setPath("src/main/java/Action.java")); @@ -126,13 +126,13 @@ public class IssueIteratorFactoryIT { @Test public void iterator_over_issue_from_project() { RuleDto rule = dbTester.rules().insert(); - ComponentDto project1 = dbTester.components().insertPrivateProject(); + ComponentDto project1 = dbTester.components().insertPrivateProject().getMainBranchComponent(); ComponentDto dir = dbTester.components().insertComponent(newDirectory(project1, "path")); ComponentDto file1 = dbTester.components().insertComponent(newFileDto(project1, dir)); String[] project1IssueKeys = Stream.of(project1, dir, file1) .map(project1Component -> dbTester.issues().insert(rule, project1, project1Component).getKey()) .toArray(String[]::new); - ComponentDto project2 = dbTester.components().insertPrivateProject(); + ComponentDto project2 = dbTester.components().insertPrivateProject().getMainBranchComponent(); ComponentDto dir2 = dbTester.components().insertComponent(newDirectory(project2, "path")); ComponentDto file2 = dbTester.components().insertComponent(newFileDto(project2, dir2)); String[] project2IssueKeys = Stream.of(project2, dir2, file2) @@ -150,7 +150,7 @@ public class IssueIteratorFactoryIT { @Test public void extract_directory_path() { RuleDto rule = dbTester.rules().insert(); - ComponentDto project = dbTester.components().insertPrivateProject(); + ComponentDto project = dbTester.components().insertPrivateProject().getMainBranchComponent(); ComponentDto fileInRootDir = dbTester.components().insertComponent(newFileDto(project).setPath("pom.xml")); ComponentDto fileInSubDir = dbTester.components().insertComponent(newFileDto(project).setPath("src/main/java/Action.java")); IssueDto projectIssue = dbTester.issues().insert(rule, project, project); @@ -168,7 +168,7 @@ public class IssueIteratorFactoryIT { @Test public void extract_file_path() { RuleDto rule = dbTester.rules().insert(); - ComponentDto project = dbTester.components().insertPrivateProject(); + ComponentDto project = dbTester.components().insertPrivateProject().getMainBranchComponent(); ComponentDto fileInRootDir = dbTester.components().insertComponent(newFileDto(project).setPath("pom.xml")); ComponentDto fileInSubDir = dbTester.components().insertComponent(newFileDto(project).setPath("src/main/java/Action.java")); IssueDto projectIssue = dbTester.issues().insert(rule, project, project); diff --git a/server/sonar-server-common/src/it/java/org/sonar/server/issue/notification/NewIssuesNotificationIT.java b/server/sonar-server-common/src/it/java/org/sonar/server/issue/notification/NewIssuesNotificationIT.java index 4cba1b8c865..d1af6a85f96 100644 --- a/server/sonar-server-common/src/it/java/org/sonar/server/issue/notification/NewIssuesNotificationIT.java +++ b/server/sonar-server-common/src/it/java/org/sonar/server/issue/notification/NewIssuesNotificationIT.java @@ -141,7 +141,7 @@ public class NewIssuesNotificationIT { public void set_statistics() { UserDto maynard = db.users().insertUser(u -> u.setLogin("maynard")); UserDto keenan = db.users().insertUser(u -> u.setLogin("keenan")); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto directory = db.components().insertComponent(newDirectory(project, "path")); ComponentDto file = db.components().insertComponent(newFileDto(directory)); RuleDto rule1 = db.rules().insert(r -> r.setRepositoryKey("SonarQube").setRuleKey("rule1-the-world").setName("Rule the World").setLanguage("Java")); @@ -183,7 +183,7 @@ public class NewIssuesNotificationIT { public void set_statistics_when_no_issues_created_on_current_analysis() { UserDto maynard = db.users().insertUser(u -> u.setLogin("maynard")); UserDto keenan = db.users().insertUser(u -> u.setLogin("keenan")); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto directory = db.components().insertComponent(newDirectory(project, "path")); ComponentDto file = db.components().insertComponent(newFileDto(directory)); RuleDto rule1 = db.rules().insert(r -> r.setRepositoryKey("SonarQube").setRuleKey("rule1-the-world").setName("Rule the World").setLanguage("Java")); @@ -226,7 +226,7 @@ public class NewIssuesNotificationIT { UserDto maynard = db.users().insertUser(u -> u.setLogin("maynard")); UserDto keenan = db.users().insertUser(u -> u.setLogin("keenan")); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto directory = db.components().insertComponent(newDirectory(project, "path")); ComponentDto file = db.components().insertComponent(newFileDto(directory)); RuleDto rule1 = db.rules().insert(r -> r.setRepositoryKey("SonarQube").setRuleKey("rule1-the-world").setName("Rule the World").setLanguage("Java")); @@ -285,7 +285,7 @@ public class NewIssuesNotificationIT { @Test public void set_assignee() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); RuleDto rule = db.rules().insert(); UserDto user = db.users().insertUser(); @@ -312,7 +312,7 @@ public class NewIssuesNotificationIT { UserDto user6 = db.users().insertUser(); UserDto user7 = db.users().insertUser(); UserDto user8 = db.users().insertUser(); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); RuleDto rule = db.rules().insert(); NewIssuesStatistics.Stats stats = new NewIssuesStatistics.Stats(i -> true); @@ -346,7 +346,7 @@ public class NewIssuesNotificationIT { @Test public void add_only_5_components_with_biggest_issue_counts() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); RuleDto rule = db.rules().insert(); NewIssuesStatistics.Stats stats = new NewIssuesStatistics.Stats(i -> true); ComponentDto file1 = db.components().insertComponent(newFileDto(project)); @@ -386,7 +386,7 @@ public class NewIssuesNotificationIT { @Test public void add_only_5_rules_with_biggest_issue_counts() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); NewIssuesStatistics.Stats stats = new NewIssuesStatistics.Stats(i -> true); RuleDto rule1 = db.rules().insert(r -> r.setLanguage("Java")); diff --git a/server/sonar-server-common/src/it/java/org/sonar/server/measure/index/ProjectMeasuresIndexerIT.java b/server/sonar-server-common/src/it/java/org/sonar/server/measure/index/ProjectMeasuresIndexerIT.java index 541cc03bd93..1eb7f3d6401 100644 --- a/server/sonar-server-common/src/it/java/org/sonar/server/measure/index/ProjectMeasuresIndexerIT.java +++ b/server/sonar-server-common/src/it/java/org/sonar/server/measure/index/ProjectMeasuresIndexerIT.java @@ -124,7 +124,7 @@ public class ProjectMeasuresIndexerIT { */ @Test public void indexOnStartup_indexes_provisioned_projects() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); underTest.indexOnStartup(emptySet()); @@ -133,7 +133,7 @@ public class ProjectMeasuresIndexerIT { @Test public void indexOnStartup_ignores_non_main_branches() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto branch = db.components().insertProjectBranch(project, b -> b.setKey("feature/foo")); underTest.indexOnStartup(emptySet()); @@ -143,9 +143,9 @@ public class ProjectMeasuresIndexerIT { @Test public void indexOnStartup_indexes_all_applications() { - ComponentDto application1 = db.components().insertPrivateApplication(); - ComponentDto application2 = db.components().insertPrivateApplication(); - ComponentDto application3 = db.components().insertPrivateApplication(); + ComponentDto application1 = db.components().insertPrivateApplication().getMainBranchComponent(); + ComponentDto application2 = db.components().insertPrivateApplication().getMainBranchComponent(); + ComponentDto application3 = db.components().insertPrivateApplication().getMainBranchComponent(); underTest.indexOnStartup(emptySet()); @@ -155,13 +155,13 @@ public class ProjectMeasuresIndexerIT { @Test public void indexOnStartup_indexes_projects_and_applications() { - ComponentDto project1 = db.components().insertPrivateProject(); - ComponentDto project2 = db.components().insertPrivateProject(); - ComponentDto project3 = db.components().insertPrivateProject(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project3 = db.components().insertPrivateProject().getMainBranchComponent(); - ComponentDto application1 = db.components().insertPrivateApplication(); - ComponentDto application2 = db.components().insertPrivateApplication(); - ComponentDto application3 = db.components().insertPrivateApplication(); + ComponentDto application1 = db.components().insertPrivateApplication().getMainBranchComponent(); + ComponentDto application2 = db.components().insertPrivateApplication().getMainBranchComponent(); + ComponentDto application3 = db.components().insertPrivateApplication().getMainBranchComponent(); underTest.indexOnStartup(emptySet()); @@ -172,8 +172,8 @@ public class ProjectMeasuresIndexerIT { @Test public void indexOnAnalysis_indexes_provisioned_project() { - ComponentDto project1 = db.components().insertPrivateProject(); - ComponentDto project2 = db.components().insertPrivateProject(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); underTest.indexOnAnalysis(project1.uuid()); @@ -182,8 +182,8 @@ public class ProjectMeasuresIndexerIT { @Test public void indexOnAnalysis_indexes_provisioned_application() { - ComponentDto app1 = db.components().insertPrivateApplication(); - ComponentDto app2 = db.components().insertPrivateApplication(); + ComponentDto app1 = db.components().insertPrivateApplication().getMainBranchComponent(); + ComponentDto app2 = db.components().insertPrivateApplication().getMainBranchComponent(); underTest.indexOnAnalysis(app1.uuid()); @@ -192,7 +192,7 @@ public class ProjectMeasuresIndexerIT { @Test public void update_index_when_project_key_is_updated() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); IndexingResult result = indexProject(project, PROJECT_KEY_UPDATE); @@ -203,7 +203,7 @@ public class ProjectMeasuresIndexerIT { @Test public void update_index_when_project_is_created() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); IndexingResult result = indexProject(project, PROJECT_CREATION); @@ -214,11 +214,11 @@ public class ProjectMeasuresIndexerIT { @Test public void update_index_when_project_tags_are_updated() { - ComponentDto project = db.components().insertPrivateProject(defaults(), p -> p.setTagsString("foo")); + ComponentDto project = db.components().insertPrivateProject(defaults(), p -> p.setTagsString("foo")).getMainBranchComponent(); indexProject(project, PROJECT_CREATION); assertThatProjectHasTag(project, "foo"); - ProjectDto projectDto = db.components().getProjectDto(project); + ProjectDto projectDto = db.components().getProjectDtoByMainBranch(project); projectDto.setTagsString("bar"); db.getDbClient().projectDao().updateTags(db.getSession(), projectDto); // TODO change indexing? @@ -231,7 +231,7 @@ public class ProjectMeasuresIndexerIT { @Test public void delete_doc_from_index_when_project_is_deleted() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); indexProject(project, PROJECT_CREATION); assertThatIndexContainsOnly(project); @@ -246,8 +246,8 @@ public class ProjectMeasuresIndexerIT { @Test public void do_nothing_if_no_projects_and_apps_to_index() { // this project should not be indexed - db.components().insertPrivateProject(); - db.components().insertPrivateApplication(); + db.components().insertPrivateProject().getMainBranchComponent(); + db.components().insertPrivateApplication().getMainBranchComponent(); underTest.index(db.getSession(), emptyList()); @@ -256,7 +256,7 @@ public class ProjectMeasuresIndexerIT { @Test public void errors_during_indexing_are_recovered() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); es.lockWrites(TYPE_PROJECT_MEASURES); IndexingResult result = indexProject(project, PROJECT_CREATION); @@ -281,7 +281,7 @@ public class ProjectMeasuresIndexerIT { @Test public void non_main_branches_are_not_indexed_during_analysis() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto branch = db.components().insertProjectBranch(project, b -> b.setKey("feature/foo")); underTest.indexOnAnalysis(branch.uuid()); diff --git a/server/sonar-server-common/src/it/java/org/sonar/server/qualitygate/QualityGateFinderIT.java b/server/sonar-server-common/src/it/java/org/sonar/server/qualitygate/QualityGateFinderIT.java index 27fe578fbe8..35325d17c37 100644 --- a/server/sonar-server-common/src/it/java/org/sonar/server/qualitygate/QualityGateFinderIT.java +++ b/server/sonar-server-common/src/it/java/org/sonar/server/qualitygate/QualityGateFinderIT.java @@ -41,7 +41,7 @@ public class QualityGateFinderIT { @Test public void return_default_quality_gate_for_project() { - ProjectDto project = db.components().insertPrivateProjectDto(); + ProjectDto project = db.components().insertPrivateProject().getProjectDto(); QualityGateDto dbQualityGate = db.qualityGates().createDefaultQualityGate(qg -> qg.setName("Sonar way")); QualityGateFinder.QualityGateData result = underTest.getEffectiveQualityGate(dbSession, project); @@ -52,7 +52,7 @@ public class QualityGateFinderIT { @Test public void return_project_quality_gate_over_default() { - ProjectDto project = db.components().insertPrivateProjectDto(); + ProjectDto project = db.components().insertPrivateProject().getProjectDto(); db.qualityGates().createDefaultQualityGate(qg -> qg.setName("Sonar way")); QualityGateDto dbQualityGate = db.qualityGates().insertQualityGate(qg -> qg.setName("My team QG")); db.qualityGates().associateProjectToQualityGate(project, dbQualityGate); @@ -65,7 +65,7 @@ public class QualityGateFinderIT { @Test public void fail_when_default_qgate_defined_does_not_exist() { - ProjectDto project = db.components().insertPrivateProjectDto(); + ProjectDto project = db.components().insertPrivateProject().getProjectDto(); QualityGateDto dbQualityGate = db.qualityGates().createDefaultQualityGate(qg -> qg.setName("Sonar way")); db.getDbClient().qualityGateDao().delete(dbQualityGate, dbSession); db.commit(); @@ -77,7 +77,7 @@ public class QualityGateFinderIT { @Test public void fail_when_project_qgate_defined_does_not_exist() { - ProjectDto project = db.components().insertPrivateProjectDto(); + ProjectDto project = db.components().insertPrivateProject().getProjectDto(); QualityGateDto dbQualityGate = db.qualityGates().insertQualityGate(qg -> qg.setName("My team QG")); db.qualityGates().setDefaultQualityGate(dbQualityGate); db.qualityGates().associateProjectToQualityGate(project, dbQualityGate); @@ -90,7 +90,7 @@ public class QualityGateFinderIT { @Test public void fail_when_qgate_property_does_not_exist() { - ProjectDto project = db.components().insertPrivateProjectDto(); + ProjectDto project = db.components().insertPrivateProject().getProjectDto(); QualityGateDto dbQualityGate = db.qualityGates().insertQualityGate(qg -> qg.setName("My team QG")); db.getDbClient().qualityGateDao().delete(dbQualityGate, dbSession); diff --git a/server/sonar-server-common/src/it/java/org/sonar/server/view/index/ViewIndexerIT.java b/server/sonar-server-common/src/it/java/org/sonar/server/view/index/ViewIndexerIT.java index 3365bcabf75..f414222b43f 100644 --- a/server/sonar-server-common/src/it/java/org/sonar/server/view/index/ViewIndexerIT.java +++ b/server/sonar-server-common/src/it/java/org/sonar/server/view/index/ViewIndexerIT.java @@ -71,13 +71,13 @@ public class ViewIndexerIT { @Test public void index_on_startup() { // simple view - ComponentDto project1 = db.components().insertPrivateProject(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto view1 = db.components().insertPrivatePortfolio(); db.components().insertSnapshot(view1, t -> t.setLast(true)); db.components().insertComponent(newProjectCopy(project1, view1)); // view with subview - ComponentDto project2 = db.components().insertPrivateProject(); - ComponentDto project3 = db.components().insertPrivateProject(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project3 = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto view2 = db.components().insertPrivatePortfolio(); db.components().insertSnapshot(view2, t -> t.setLast(true)); db.components().insertComponent(newProjectCopy(project2, view2)); @@ -103,13 +103,13 @@ public class ViewIndexerIT { @Test public void index_root_view() { // simple view - ComponentDto project1 = db.components().insertPrivateProject(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto view1 = db.components().insertPrivatePortfolio(); db.components().insertSnapshot(view1, t -> t.setLast(true)); db.components().insertComponent(newProjectCopy(project1, view1)); // view with subview - ComponentDto project2 = db.components().insertPrivateProject(); - ComponentDto project3 = db.components().insertPrivateProject(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project3 = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto view2 = db.components().insertPrivatePortfolio(); db.components().insertSnapshot(view2, t -> t.setLast(true)); db.components().insertComponent(newProjectCopy(project2, view2)); @@ -144,8 +144,8 @@ public class ViewIndexerIT { @Test public void index_application() { - ComponentDto application = db.components().insertPrivateApplication(); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto application = db.components().insertPrivateApplication().getMainBranchComponent(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); db.components().insertComponent(newProjectCopy("PC1", project, application)); underTest.index(application.uuid()); @@ -159,8 +159,8 @@ public class ViewIndexerIT { @Test public void index_application_on_startup() { - ComponentDto application = db.components().insertPrivateApplication(); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto application = db.components().insertPrivateApplication().getMainBranchComponent(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); db.components().insertComponent(newProjectCopy("PC1", project, application)); underTest.indexOnStartup(emptySet()); @@ -174,8 +174,8 @@ public class ViewIndexerIT { @Test public void index_application_with_indexAll() { - ComponentDto application = db.components().insertPrivateApplication(); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto application = db.components().insertPrivateApplication().getMainBranchComponent(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); db.components().insertComponent(newProjectCopy("PC1", project, application)); underTest.indexAll(); @@ -189,14 +189,14 @@ public class ViewIndexerIT { @Test public void index_application_branch() { - ComponentDto application = db.components().insertPublicProject(c -> c.setQualifier(APP).setKey("app")); + ComponentDto application = db.components().insertPublicProject(c -> c.setQualifier(APP).setKey("app")).getMainBranchComponent(); ComponentDto applicationBranch1 = db.components().insertProjectBranch(application, a -> a.setKey("app-branch1")); ComponentDto applicationBranch2 = db.components().insertProjectBranch(application, a -> a.setKey("app-branch2")); - ComponentDto project1 = db.components().insertPrivateProject(p -> p.setKey("prj1")); + ComponentDto project1 = db.components().insertPrivateProject(p -> p.setKey("prj1")).getMainBranchComponent(); ComponentDto project1Branch = db.components().insertProjectBranch(project1); - ComponentDto project2 = db.components().insertPrivateProject(p -> p.setKey("prj2")); + ComponentDto project2 = db.components().insertPrivateProject(p -> p.setKey("prj2")).getMainBranchComponent(); ComponentDto project2Branch = db.components().insertProjectBranch(project2); - ComponentDto project3 = db.components().insertPrivateProject(p -> p.setKey("prj3")); + ComponentDto project3 = db.components().insertPrivateProject(p -> p.setKey("prj3")).getMainBranchComponent(); ComponentDto project3Branch = db.components().insertProjectBranch(project3); db.components().insertComponent(newProjectCopy(project1Branch, applicationBranch1)); db.components().insertComponent(newProjectCopy(project2Branch, applicationBranch1)); diff --git a/server/sonar-server-common/src/it/java/org/sonar/server/webhook/AsynchronousWebHooksImplIT.java b/server/sonar-server-common/src/it/java/org/sonar/server/webhook/AsynchronousWebHooksImplIT.java index 4ae11955ae3..b903fe82604 100644 --- a/server/sonar-server-common/src/it/java/org/sonar/server/webhook/AsynchronousWebHooksImplIT.java +++ b/server/sonar-server-common/src/it/java/org/sonar/server/webhook/AsynchronousWebHooksImplIT.java @@ -62,7 +62,7 @@ public class AsynchronousWebHooksImplIT { @Test public void send_global_webhooks() { - ComponentDto project = componentDbTester.insertPrivateProject(); + ComponentDto project = componentDbTester.insertPrivateProject().getMainBranchComponent(); webhookDbTester.insert(newGlobalWebhook().setName("First").setUrl("http://url1"), null, null); webhookDbTester.insert(newGlobalWebhook().setName("Second").setUrl("http://url2"), null, null); diff --git a/server/sonar-server-common/src/it/java/org/sonar/server/webhook/SynchronousWebHooksImplIT.java b/server/sonar-server-common/src/it/java/org/sonar/server/webhook/SynchronousWebHooksImplIT.java index cc932b1b8b6..84dc0fff7c1 100644 --- a/server/sonar-server-common/src/it/java/org/sonar/server/webhook/SynchronousWebHooksImplIT.java +++ b/server/sonar-server-common/src/it/java/org/sonar/server/webhook/SynchronousWebHooksImplIT.java @@ -74,13 +74,13 @@ public class SynchronousWebHooksImplIT { @Test public void isEnabled_returns_false_if_no_webhooks() { - ProjectDto projectDto = componentDbTester.insertPrivateProjectDto(); + ProjectDto projectDto = componentDbTester.insertPrivateProject().getProjectDto(); assertThat(underTest.isEnabled(projectDto)).isFalse(); } @Test public void isEnabled_returns_true_if_one_valid_global_webhook() { - ProjectDto projectDto = componentDbTester.insertPrivateProjectDto(); + ProjectDto projectDto = componentDbTester.insertPrivateProject().getProjectDto(); webhookDbTester.insert(newWebhook(projectDto).setName("First").setUrl("http://url1"), projectDto.getKey(), projectDto.getName()); assertThat(underTest.isEnabled(projectDto)).isTrue(); @@ -88,7 +88,7 @@ public class SynchronousWebHooksImplIT { @Test public void isEnabled_returns_true_if_one_valid_project_webhook() { - ProjectDto projectDto = componentDbTester.insertPrivateProjectDto(); + ProjectDto projectDto = componentDbTester.insertPrivateProject().getProjectDto(); webhookDbTester.insert(newWebhook(projectDto).setName("First").setUrl("http://url1"), projectDto.getKey(), projectDto.getName()); assertThat(underTest.isEnabled(projectDto)).isTrue(); @@ -96,7 +96,7 @@ public class SynchronousWebHooksImplIT { @Test public void do_nothing_if_no_webhooks() { - ComponentDto componentDto = componentDbTester.insertPrivateProject(); + ComponentDto componentDto = componentDbTester.insertPrivateProject().getMainBranchComponent(); underTest.sendProjectAnalysisUpdate(new WebHooks.Analysis(componentDto.uuid(), "1", "#1"), () -> mock); @@ -107,7 +107,7 @@ public class SynchronousWebHooksImplIT { @Test public void populates_log_statistics_even_if_no_webhooks() { - ComponentDto componentDto = componentDbTester.insertPrivateProject(); + ComponentDto componentDto = componentDbTester.insertPrivateProject().getMainBranchComponent(); underTest.sendProjectAnalysisUpdate(new WebHooks.Analysis(componentDto.uuid(), "1", "#1"), () -> mock, taskStatistics); @@ -119,7 +119,7 @@ public class SynchronousWebHooksImplIT { @Test public void send_global_webhooks() { - ComponentDto componentDto = componentDbTester.insertPrivateProject(); + ComponentDto componentDto = componentDbTester.insertPrivateProject().getMainBranchComponent(); webhookDbTester.insert(newGlobalWebhook().setName("First").setUrl("http://url1"), null, null); webhookDbTester.insert(newGlobalWebhook().setName("Second").setUrl("http://url2"), null, null); caller.enqueueSuccess(NOW, 200, 1_234); @@ -143,7 +143,7 @@ public class SynchronousWebHooksImplIT { @Test public void send_project_webhooks() { - ProjectDto projectDto = componentDbTester.insertPrivateProjectDto(); + ProjectDto projectDto = componentDbTester.insertPrivateProject().getProjectDto(); webhookDbTester.insert(newWebhook(projectDto).setName("First").setUrl("http://url1"), projectDto.getKey(), projectDto.getName()); caller.enqueueSuccess(NOW, 200, 1_234); @@ -158,7 +158,7 @@ public class SynchronousWebHooksImplIT { @Test public void send_global_and_project_webhooks() { - ProjectDto projectDto = componentDbTester.insertPrivateProjectDto(); + ProjectDto projectDto = componentDbTester.insertPrivateProject().getProjectDto(); webhookDbTester.insert(newWebhook(projectDto).setName("1First").setUrl("http://url1"), projectDto.getKey(), projectDto.getName()); webhookDbTester.insert(newWebhook(projectDto).setName("2Second").setUrl("http://url2"), projectDto.getKey(), projectDto.getName()); webhookDbTester.insert(newGlobalWebhook().setName("3Third").setUrl("http://url3"), null, null); diff --git a/server/sonar-webserver-auth/src/test/java/org/sonar/server/user/ServerUserSessionTest.java b/server/sonar-webserver-auth/src/test/java/org/sonar/server/user/ServerUserSessionTest.java index 1df7820c39c..f7bc5792992 100644 --- a/server/sonar-webserver-auth/src/test/java/org/sonar/server/user/ServerUserSessionTest.java +++ b/server/sonar-webserver-auth/src/test/java/org/sonar/server/user/ServerUserSessionTest.java @@ -134,7 +134,7 @@ public class ServerUserSessionTest { @Test public void checkComponentUuidPermission_fails_with_FE_when_user_has_not_permission_for_specified_uuid_in_db() { UserDto user = db.users().insertUser(); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); db.users().insertProjectPermissionOnUser(user, UserRole.USER, project); UserSession session = newUserSession(user); @@ -144,9 +144,9 @@ public class ServerUserSessionTest { @Test public void checkChildProjectsPermission_succeeds_if_user_has_permissions_on_all_application_child_projects() { UserDto user = db.users().insertUser(); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); db.users().insertProjectPermissionOnUser(user, UserRole.USER, project); - ComponentDto application = db.components().insertPrivateApplication(); + ComponentDto application = db.components().insertPrivateApplication().getMainBranchComponent(); db.components().addApplicationProject(application, project); UserSession underTest = newUserSession(user); @@ -157,7 +157,7 @@ public class ServerUserSessionTest { @Test public void checkChildProjectsPermission_succeeds_if_component_is_not_an_application() { UserDto user = db.users().insertUser(); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); UserSession underTest = newUserSession(user); @@ -167,8 +167,8 @@ public class ServerUserSessionTest { @Test public void checkChildProjectsPermission_fails_with_FE_when_user_has_not_permission_for_specified_uuid_in_db() { UserDto user = db.users().insertUser(); - ComponentDto project = db.components().insertPrivateProject(); - ComponentDto application = db.components().insertPrivateApplication(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto application = db.components().insertPrivateApplication().getMainBranchComponent(); db.components().addApplicationProject(application, project); // add computed project db.components().insertComponent(newProjectCopy(project, application)); @@ -195,7 +195,7 @@ public class ServerUserSessionTest { @Test public void test_hasPermission_for_logged_in_user() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); UserDto user = db.users().insertUser(); db.users().insertGlobalPermissionOnUser(user, GlobalPermission.PROVISION_PROJECTS); db.users().insertProjectPermissionOnUser(user, UserRole.ADMIN, project); @@ -249,12 +249,12 @@ public class ServerUserSessionTest { @Test public void test_hasChildProjectsPermission_for_logged_in_user() { - ComponentDto project1 = db.components().insertPrivateProject(); - ComponentDto project2 = db.components().insertPrivateProject(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); UserDto user = db.users().insertUser(); db.users().insertProjectPermissionOnUser(user, UserRole.USER, project1); - ComponentDto application = db.components().insertPrivateApplication(); + ComponentDto application = db.components().insertPrivateApplication().getMainBranchComponent(); db.components().addApplicationProject(application, project1); // add computed project db.components().insertComponent(newProjectCopy(project1, application)); @@ -270,9 +270,9 @@ public class ServerUserSessionTest { @Test public void test_hasChildProjectsPermission_for_anonymous_user() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); db.users().insertPermissionOnAnyone(UserRole.USER); - ComponentDto application = db.components().insertPrivateApplication(); + ComponentDto application = db.components().insertPrivateApplication().getMainBranchComponent(); db.components().addApplicationProject(application, project); // add computed project db.components().insertComponent(newProjectCopy(project, application)); @@ -285,8 +285,8 @@ public class ServerUserSessionTest { public void hasChildProjectsPermission_keeps_cache_of_permissions_of_anonymous_user() { db.users().insertPermissionOnAnyone(UserRole.USER); - ComponentDto project = db.components().insertPublicProject(); - ComponentDto application = db.components().insertPublicApplication(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); + ComponentDto application = db.components().insertPublicApplication().getMainBranchComponent(); db.components().addApplicationProject(application, project); UserSession session = newAnonymousSession(); @@ -301,11 +301,11 @@ public class ServerUserSessionTest { @Test public void test_hasPortfolioChildProjectsPermission_for_logged_in_user() { - ComponentDto project1 = db.components().insertPublicProject(); - ComponentDto project2 = db.components().insertPrivateProject(); - ComponentDto project3 = db.components().insertPrivateProject(); - ComponentDto project4 = db.components().insertPrivateProject(); - ComponentDto project5 = db.components().insertPrivateProject(); + ComponentDto project1 = db.components().insertPublicProject().getMainBranchComponent(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project3 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project4 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project5 = db.components().insertPrivateProject().getMainBranchComponent(); UserDto user = db.users().insertUser(); UserSession session = newUserSession(user); @@ -352,7 +352,7 @@ public class ServerUserSessionTest { @Test public void test_hasPortfolioChildProjectsPermission_for_anonymous_user() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); db.users().insertPermissionOnAnyone(UserRole.USER); @@ -370,7 +370,7 @@ public class ServerUserSessionTest { public void hasPortfolioChildProjectsPermission_keeps_cache_of_permissions_of_anonymous_user() { db.users().insertPermissionOnAnyone(UserRole.USER); - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto portfolio = db.components().insertPublicPortfolio(); db.components().addPortfolioProject(portfolio, project); @@ -386,7 +386,7 @@ public class ServerUserSessionTest { @Test public void hasComponentPermissionByDtoOrUuid_returns_true_for_anonymous_user_for_permissions_USER_and_CODEVIEWER_on_public_projects_without_permissions() { - ComponentDto publicProject = db.components().insertPublicProject(); + ComponentDto publicProject = db.components().insertPublicProject().getMainBranchComponent(); ServerUserSession underTest = newAnonymousSession(); @@ -396,7 +396,7 @@ public class ServerUserSessionTest { @Test public void hasComponentPermissionByDtoOrUuid_returns_true_for_anonymous_user_for_permissions_USER_and_CODEVIEWER_on_public_projects_with_global_permissions() { - ComponentDto publicProject = db.components().insertPublicProject(); + ComponentDto publicProject = db.components().insertPublicProject().getMainBranchComponent(); db.users().insertProjectPermissionOnAnyone("p1", publicProject); ServerUserSession underTest = newAnonymousSession(); @@ -407,7 +407,7 @@ public class ServerUserSessionTest { @Test public void hasComponentPermissionByDtoOrUuid_returns_true_for_anonymous_user_for_permissions_USER_and_CODEVIEWER_on_public_projects_with_group_permissions() { - ComponentDto publicProject = db.components().insertPublicProject(); + ComponentDto publicProject = db.components().insertPublicProject().getMainBranchComponent(); db.users().insertProjectPermissionOnGroup(db.users().insertGroup(), "p1", publicProject); ServerUserSession underTest = newAnonymousSession(); @@ -418,7 +418,7 @@ public class ServerUserSessionTest { @Test public void hasComponentPermissionByDtoOrUuid_returns_true_for_anonymous_user_for_permissions_USER_and_CODEVIEWER_on_public_projects_with_user_permissions() { - ComponentDto publicProject = db.components().insertPublicProject(); + ComponentDto publicProject = db.components().insertPublicProject().getMainBranchComponent(); db.users().insertProjectPermissionOnUser(db.users().insertUser(), "p1", publicProject); ServerUserSession underTest = newAnonymousSession(); @@ -430,7 +430,7 @@ public class ServerUserSessionTest { @Test public void hasComponentPermissionByDtoOrUuid_returns_false_for_authenticated_user_for_permissions_USER_and_CODEVIEWER_on_private_projects_without_permissions() { UserDto user = db.users().insertUser(); - ComponentDto privateProject = db.components().insertPrivateProject(); + ComponentDto privateProject = db.components().insertPrivateProject().getMainBranchComponent(); ServerUserSession underTest = newUserSession(user); @@ -441,7 +441,7 @@ public class ServerUserSessionTest { @Test public void hasComponentPermissionByDtoOrUuid_returns_false_for_authenticated_user_for_permissions_USER_and_CODEVIEWER_on_private_projects_with_group_permissions() { UserDto user = db.users().insertUser(); - ComponentDto privateProject = db.components().insertPrivateProject(); + ComponentDto privateProject = db.components().insertPrivateProject().getMainBranchComponent(); db.users().insertProjectPermissionOnGroup(db.users().insertGroup(), "p1", privateProject); ServerUserSession underTest = newUserSession(user); @@ -453,7 +453,7 @@ public class ServerUserSessionTest { @Test public void hasComponentPermissionByDtoOrUuid_returns_false_for_authenticated_user_for_permissions_USER_and_CODEVIEWER_on_private_projects_with_user_permissions() { UserDto user = db.users().insertUser(); - ComponentDto privateProject = db.components().insertPrivateProject(); + ComponentDto privateProject = db.components().insertPrivateProject().getMainBranchComponent(); db.users().insertProjectPermissionOnUser(db.users().insertUser(), "p1", privateProject); ServerUserSession underTest = newUserSession(user); @@ -464,7 +464,7 @@ public class ServerUserSessionTest { @Test public void hasComponentPermissionByDtoOrUuid_returns_true_for_anonymous_user_for_inserted_permissions_on_group_AnyOne_on_public_projects() { - ComponentDto publicProject = db.components().insertPublicProject(); + ComponentDto publicProject = db.components().insertPublicProject().getMainBranchComponent(); db.users().insertProjectPermissionOnAnyone("p1", publicProject); ServerUserSession underTest = newAnonymousSession(); @@ -474,7 +474,7 @@ public class ServerUserSessionTest { @Test public void hasComponentPermissionByDtoOrUuid_returns_false_for_anonymous_user_for_inserted_permissions_on_group_on_public_projects() { - ComponentDto publicProject = db.components().insertPublicProject(); + ComponentDto publicProject = db.components().insertPublicProject().getMainBranchComponent(); GroupDto group = db.users().insertGroup(); db.users().insertProjectPermissionOnGroup(group, "p1", publicProject); @@ -485,7 +485,7 @@ public class ServerUserSessionTest { @Test public void hasComponentPermissionByDtoOrUuid_returns_false_for_anonymous_user_for_inserted_permissions_on_group_on_private_projects() { - ComponentDto privateProject = db.components().insertPrivateProject(); + ComponentDto privateProject = db.components().insertPrivateProject().getMainBranchComponent(); GroupDto group = db.users().insertGroup(); db.users().insertProjectPermissionOnGroup(group, "p1", privateProject); @@ -497,7 +497,7 @@ public class ServerUserSessionTest { @Test public void hasComponentPermissionByDtoOrUuid_returns_false_for_anonymous_user_for_inserted_permissions_on_user_on_public_projects() { UserDto user = db.users().insertUser(); - ComponentDto publicProject = db.components().insertPublicProject(); + ComponentDto publicProject = db.components().insertPublicProject().getMainBranchComponent(); db.users().insertProjectPermissionOnUser(user, "p1", publicProject); ServerUserSession underTest = newAnonymousSession(); @@ -508,7 +508,7 @@ public class ServerUserSessionTest { @Test public void hasComponentPermissionByDtoOrUuid_returns_false_for_anonymous_user_for_inserted_permissions_on_user_on_private_projects() { UserDto user = db.users().insertUser(); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); db.users().insertProjectPermissionOnUser(user, "p1", project); ServerUserSession underTest = newAnonymousSession(); @@ -519,7 +519,7 @@ public class ServerUserSessionTest { @Test public void hasComponentPermissionByDtoOrUuid_keeps_cache_of_permissions_of_logged_in_user() { UserDto user = db.users().insertUser(); - ComponentDto publicProject = db.components().insertPublicProject(); + ComponentDto publicProject = db.components().insertPublicProject().getMainBranchComponent(); db.users().insertProjectPermissionOnUser(user, UserRole.ADMIN, publicProject); UserSession underTest = newUserSession(user); @@ -536,7 +536,7 @@ public class ServerUserSessionTest { @Test public void hasComponentPermissionByDtoOrUuid_keeps_cache_of_permissions_of_anonymous_user() { - ComponentDto publicProject = db.components().insertPublicProject(); + ComponentDto publicProject = db.components().insertPublicProject().getMainBranchComponent(); db.users().insertProjectPermissionOnAnyone(UserRole.ADMIN, publicProject); UserSession underTest = newAnonymousSession(); @@ -560,8 +560,8 @@ public class ServerUserSessionTest { @Test public void keepAuthorizedComponents_returns_empty_list_if_no_permissions_are_granted() { - ComponentDto publicProject = db.components().insertPublicProject(); - ComponentDto privateProject = db.components().insertPrivateProject(); + ComponentDto publicProject = db.components().insertPublicProject().getMainBranchComponent(); + ComponentDto privateProject = db.components().insertPrivateProject().getMainBranchComponent(); UserSession underTest = newAnonymousSession(); @@ -570,8 +570,8 @@ public class ServerUserSessionTest { @Test public void keepAuthorizedComponents_filters_components_with_granted_permissions_for_anonymous() { - ComponentDto publicProject = db.components().insertPublicProject(); - ComponentDto privateProject = db.components().insertPrivateProject(); + ComponentDto publicProject = db.components().insertPublicProject().getMainBranchComponent(); + ComponentDto privateProject = db.components().insertPrivateProject().getMainBranchComponent(); db.users().insertProjectPermissionOnAnyone(UserRole.ISSUE_ADMIN, publicProject); UserSession underTest = newAnonymousSession(); @@ -583,7 +583,7 @@ public class ServerUserSessionTest { @Test public void keepAuthorizedComponents_on_branches() { UserDto user = db.users().insertUser(); - ComponentDto privateProject = db.components().insertPrivateProject(); + ComponentDto privateProject = db.components().insertPrivateProject().getMainBranchComponent(); db.users().insertProjectPermissionOnUser(user, UserRole.ADMIN, privateProject); ComponentDto privateBranchProject = db.components().insertProjectBranch(privateProject); @@ -595,12 +595,12 @@ public class ServerUserSessionTest { @Test public void keepAuthorizedComponents_filters_components_with_granted_permissions_for_logged_in_user() { - ComponentDto project1 = db.components().insertPublicProject(); - ComponentDto project2 = db.components().insertPrivateProject(); - ComponentDto project3 = db.components().insertPrivateProject(); - ComponentDto project4 = db.components().insertPrivateProject(); - ComponentDto project5 = db.components().insertPrivateProject(); - ComponentDto project6 = db.components().insertPrivateProject(); + ComponentDto project1 = db.components().insertPublicProject().getMainBranchComponent(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project3 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project4 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project5 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project6 = db.components().insertPrivateProject().getMainBranchComponent(); UserDto user = db.users().insertUser(); UserSession underTest = newUserSession(user); @@ -611,10 +611,10 @@ public class ServerUserSessionTest { ComponentDto subPortfolio = db.components().insertComponent(newSubPortfolio(portfolio)); db.users().insertProjectPermissionOnUser(user, UserRole.USER, subPortfolio); - ComponentDto app = db.components().insertPrivateApplication(); + ComponentDto app = db.components().insertPrivateApplication().getMainBranchComponent(); db.users().insertProjectPermissionOnUser(user, UserRole.USER, app); - ComponentDto app2 = db.components().insertPrivateApplication(); + ComponentDto app2 = db.components().insertPrivateApplication().getMainBranchComponent(); // Add public project1 to private portfolio db.components().addPortfolioProject(portfolio, project1); @@ -661,17 +661,17 @@ public class ServerUserSessionTest { @Test public void keepAuthorizedComponents_filters__files_with_granted_permissions_for_logged_in_user() { - ComponentDto project1 = db.components().insertPrivateProject(); - ComponentDto project2 = db.components().insertPrivateProject(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); UserDto user = db.users().insertUser(); UserSession underTest = newUserSession(user); db.users().insertProjectPermissionOnUser(user, UserRole.USER, project1); - ComponentDto file1Project1 = db.components().insertFile(db.components().getProjectDto(project1)); - ComponentDto file2Project1 = db.components().insertFile(db.components().getProjectDto(project1)); + ComponentDto file1Project1 = db.components().insertFile(db.components().getProjectDtoByMainBranch(project1)); + ComponentDto file2Project1 = db.components().insertFile(db.components().getProjectDtoByMainBranch(project1)); - ComponentDto file1Project2 = db.components().insertFile(db.components().getProjectDto(project2)); + ComponentDto file1Project2 = db.components().insertFile(db.components().getProjectDtoByMainBranch(project2)); assertThat(underTest.keepAuthorizedComponents(UserRole.USER, List.of(file1Project1, file2Project1, file1Project2))).containsExactly(file1Project1, file2Project1); } @@ -735,7 +735,7 @@ public class ServerUserSessionTest { @Test public void hasComponentPermission_on_branch_checks_permissions_of_its_project() { UserDto user = db.users().insertUser(); - ComponentDto privateProject = db.components().insertPrivateProject(); + ComponentDto privateProject = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto branch = db.components().insertProjectBranch(privateProject, b -> b.setKey("feature/foo")); ComponentDto fileInBranch = db.components().insertComponent(newChildComponent("fileUuid", branch, branch).setMainBranchProjectUuid(privateProject.uuid())); @@ -751,50 +751,50 @@ public class ServerUserSessionTest { @Test public void keepAuthorizedProjects_shouldAcceptsPublicProjects_whenCalledWithPublicPermissionAndNoUser() { - ComponentDto publicProject = db.components().insertPublicProject(); - ComponentDto privateProject = db.components().insertPrivateProject(); + ComponentDto publicProject = db.components().insertPublicProject().getMainBranchComponent(); + ComponentDto privateProject = db.components().insertPrivateProject().getMainBranchComponent(); Set projectDto = Set.of(getProjectDto(publicProject), getProjectDto(privateProject)); List projectDtos = newUserSession(null).keepAuthorizedProjects(UserRole.USER, projectDto); - assertThat(projectDtos).containsExactly(db.components().getProjectDto(publicProject)); + assertThat(projectDtos).containsExactly(db.components().getProjectDtoByMainBranch(publicProject)); } @Test public void keepAuthorizedProjects_shouldAcceptsPublicProjects_whenCalledWithPublicPermissionAndAnUser() { UserDto userDto = db.users().insertUser(); - ComponentDto publicProject = db.components().insertPublicProject(); - ComponentDto privateProject = db.components().insertPrivateProject(); + ComponentDto publicProject = db.components().insertPublicProject().getMainBranchComponent(); + ComponentDto privateProject = db.components().insertPrivateProject().getMainBranchComponent(); Set projectDto = Set.of(getProjectDto(publicProject), getProjectDto(privateProject)); List projectDtos = newUserSession(userDto).keepAuthorizedProjects(UserRole.USER, projectDto); - assertThat(projectDtos).containsExactly(db.components().getProjectDto(publicProject)); + assertThat(projectDtos).containsExactly(db.components().getProjectDtoByMainBranch(publicProject)); } @Test public void keepAuthorizedProjects_shouldAcceptsOnlyPrivateProject_whenCalledWithGoodPermissionAndAnUser() { String permission = "aNewPermission"; UserDto userDto = db.users().insertUser(); - ComponentDto publicProject = db.components().insertPublicProject(); - ComponentDto privateProject = db.components().insertPrivateProject(); + ComponentDto publicProject = db.components().insertPublicProject().getMainBranchComponent(); + ComponentDto privateProject = db.components().insertPrivateProject().getMainBranchComponent(); db.users().insertProjectPermissionOnUser(userDto, permission, privateProject); - ComponentDto privateProjectWithoutPermission = db.components().insertPrivateProject(); + ComponentDto privateProjectWithoutPermission = db.components().insertPrivateProject().getMainBranchComponent(); Set projectDto = Set.of(getProjectDto(publicProject), getProjectDto(privateProject), getProjectDto(privateProjectWithoutPermission)); List projectDtos = newUserSession(userDto).keepAuthorizedProjects(permission, projectDto); - assertThat(projectDtos).containsExactly(db.components().getProjectDto(privateProject)); + assertThat(projectDtos).containsExactly(db.components().getProjectDtoByMainBranch(privateProject)); } @Test public void keepAuthorizedProjects_shouldRejectPrivateAndPublicProject_whenCalledWithWrongPermissionAndNoUser() { String permission = "aNewPermission"; UserDto userDto = db.users().insertUser(); - ComponentDto publicProject = db.components().insertPublicProject(); - ComponentDto privateProject = db.components().insertPrivateProject(); + ComponentDto publicProject = db.components().insertPublicProject().getMainBranchComponent(); + ComponentDto privateProject = db.components().insertPrivateProject().getMainBranchComponent(); db.users().insertProjectPermissionOnUser(userDto, permission, privateProject); - ComponentDto privateProjectWithoutPermission = db.components().insertPrivateProject(); + ComponentDto privateProjectWithoutPermission = db.components().insertPrivateProject().getMainBranchComponent(); Set projectDto = Set.of(getProjectDto(publicProject), getProjectDto(privateProject), getProjectDto(privateProjectWithoutPermission)); List projectDtos = newUserSession(null).keepAuthorizedProjects(permission, projectDto); @@ -803,7 +803,7 @@ public class ServerUserSessionTest { } private ProjectDto getProjectDto(ComponentDto publicProject) { - return db.components().getProjectDto(publicProject); + return db.components().getProjectDtoByMainBranch(publicProject); } private ServerUserSession newUserSession(@Nullable UserDto userDto) { diff --git a/server/sonar-webserver-auth/src/test/java/org/sonar/server/user/TokenUserSessionTest.java b/server/sonar-webserver-auth/src/test/java/org/sonar/server/user/TokenUserSessionTest.java index 4afcfb50829..4bc72f3f32d 100644 --- a/server/sonar-webserver-auth/src/test/java/org/sonar/server/user/TokenUserSessionTest.java +++ b/server/sonar-webserver-auth/src/test/java/org/sonar/server/user/TokenUserSessionTest.java @@ -43,7 +43,7 @@ public class TokenUserSessionTest { @Test public void token_can_be_retrieved_from_the_session() { - ComponentDto project1 = db.components().insertPrivateProject(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); UserDto user = db.users().insertUser(); @@ -59,8 +59,8 @@ public class TokenUserSessionTest { @Test public void test_hasProjectsPermission_for_UserToken() { - ComponentDto project1 = db.components().insertPrivateProject(); - ComponentDto project2 = db.components().insertPrivateProject(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); UserDto user = db.users().insertUser(); @@ -74,8 +74,8 @@ public class TokenUserSessionTest { @Test public void test_hasProjectsPermission_for_ProjecAnalysisToken() { - ComponentDto project1 = db.components().insertPrivateProject(); - ComponentDto project2 = db.components().insertPrivateProject(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); UserDto user = db.users().insertUser(); @@ -90,8 +90,8 @@ public class TokenUserSessionTest { @Test public void test_hasProjectsPermission_for_ProjectAnalysisToken_with_global_permission() { - ComponentDto project1 = db.components().insertPrivateProject(); - ComponentDto project2 = db.components().insertPrivateProject(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); UserDto user = db.users().insertUser(); @@ -115,8 +115,8 @@ public class TokenUserSessionTest { @Test public void test_hasGlobalPermission_for_ProjecAnalysisToken() { - ComponentDto project1 = db.components().insertPrivateProject(); - ComponentDto project2 = db.components().insertPrivateProject(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); UserDto user = db.users().insertUser(); @@ -132,7 +132,7 @@ public class TokenUserSessionTest { @Test public void test_hasGlobalPermission_for_GlobalAnalysisToken() { - ComponentDto project1 = db.components().insertPrivateProject(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); UserDto user = db.users().insertUser(); diff --git a/server/sonar-webserver-auth/src/test/java/org/sonar/server/user/UserUpdaterUpdateTest.java b/server/sonar-webserver-auth/src/test/java/org/sonar/server/user/UserUpdaterUpdateTest.java index 2ab8be4eb7a..ddea5cc1b6c 100644 --- a/server/sonar-webserver-auth/src/test/java/org/sonar/server/user/UserUpdaterUpdateTest.java +++ b/server/sonar-webserver-auth/src/test/java/org/sonar/server/user/UserUpdaterUpdateTest.java @@ -205,9 +205,9 @@ public class UserUpdaterUpdateTest { public void update_default_assignee_when_updating_login() { createDefaultGroup(); UserDto oldUser = db.users().insertUser(); - ComponentDto project1 = db.components().insertPrivateProject(); - ComponentDto project2 = db.components().insertPrivateProject(); - ComponentDto anotherProject = db.components().insertPrivateProject(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto anotherProject = db.components().insertPrivateProject().getMainBranchComponent(); db.properties().insertProperties(oldUser.getLogin(), project1.getKey(), project1.name(), project1.qualifier(), new PropertyDto().setKey(DEFAULT_ISSUE_ASSIGNEE).setValue(oldUser.getLogin()), new PropertyDto().setKey(DEFAULT_ISSUE_ASSIGNEE).setValue(oldUser.getLogin()).setComponentUuid(project1.uuid())); diff --git a/server/sonar-webserver-core/src/it/java/org/sonar/server/webhook/WebhookQGChangeEventListenerIT.java b/server/sonar-webserver-core/src/it/java/org/sonar/server/webhook/WebhookQGChangeEventListenerIT.java index 31d31456b61..c5b95aa2292 100644 --- a/server/sonar-webserver-core/src/it/java/org/sonar/server/webhook/WebhookQGChangeEventListenerIT.java +++ b/server/sonar-webserver-core/src/it/java/org/sonar/server/webhook/WebhookQGChangeEventListenerIT.java @@ -267,14 +267,14 @@ public class WebhookQGChangeEventListenerIT { } public ProjectAndBranch insertMainBranch() { - ProjectDto project = dbTester.components().insertPrivateProjectDto(); + ProjectDto project = dbTester.components().insertPrivateProject().getProjectDto(); BranchDto branch = dbTester.getDbClient().branchDao().selectByUuid(dbTester.getSession(), project.getUuid()).get(); dbTester.commit(); return new ProjectAndBranch(project, branch); } public ProjectAndBranch insertBranch(BranchType type, String branchKey) { - ProjectDto project = dbTester.components().insertPrivateProjectDto(); + ProjectDto project = dbTester.components().insertPrivateProject().getProjectDto(); BranchDto branch = dbTester.components().insertProjectBranch(project, b -> b.setKey(branchKey).setBranchType(type)); return new ProjectAndBranch(project, branch); } diff --git a/server/sonar-webserver-core/src/test/java/org/sonar/server/issue/index/AsyncIssueIndexingImplTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/issue/index/AsyncIssueIndexingImplTest.java index 7c8c3382157..a0907e93a35 100644 --- a/server/sonar-webserver-core/src/test/java/org/sonar/server/issue/index/AsyncIssueIndexingImplTest.java +++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/issue/index/AsyncIssueIndexingImplTest.java @@ -104,7 +104,7 @@ public class AsyncIssueIndexingImplTest { @Test public void triggerForProject() { - ProjectDto projectDto = dbTester.components().insertPrivateProjectDto(); + ProjectDto projectDto = dbTester.components().insertPrivateProject().getProjectDto(); BranchDto dto = new BranchDto() .setBranchType(BRANCH) .setKey("branchName") @@ -170,7 +170,7 @@ public class AsyncIssueIndexingImplTest { public void remove_existing_indexation_for_project_task() { String reportTaskUuid = persistReportTasks(); - ProjectDto projectDto = dbTester.components().insertPrivateProjectDto(); + ProjectDto projectDto = dbTester.components().insertPrivateProject().getProjectDto(); String branchUuid = "branch_uuid"; dbTester.components().insertProjectBranch(projectDto, b -> b.setBranchType(BRANCH).setUuid(branchUuid)); @@ -182,7 +182,7 @@ public class AsyncIssueIndexingImplTest { .setMainComponentUuid(projectDto.getUuid()).setComponentUuid(branchUuid); dbClient.ceQueueDao().insert(dbTester.getSession(), branchTask); - ProjectDto anotherProjectDto = dbTester.components().insertPrivateProjectDto(); + ProjectDto anotherProjectDto = dbTester.components().insertPrivateProject().getProjectDto(); CeQueueDto taskOnAnotherProject = new CeQueueDto().setUuid("uuid_4").setTaskType(BRANCH_ISSUE_SYNC) .setMainComponentUuid(anotherProjectDto.getUuid()).setComponentUuid("another-branchUuid"); CeActivityDto canceledTaskOnAnotherProject = new CeActivityDto(taskOnAnotherProject).setStatus(Status.CANCELED); diff --git a/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/db/CheckAnyonePermissionsAtStartupTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/db/CheckAnyonePermissionsAtStartupTest.java index 43b5ffc2982..381a9f7aa91 100644 --- a/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/db/CheckAnyonePermissionsAtStartupTest.java +++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/db/CheckAnyonePermissionsAtStartupTest.java @@ -150,14 +150,14 @@ public class CheckAnyonePermissionsAtStartupTest { private void createPublicProjectsWithNonAnyoneGroupPermissions() { GroupDto group = dbTester.users().insertGroup(); IntStream.rangeClosed(1, 3).forEach(i -> { - ComponentDto project = dbTester.components().insertPublicProject(p -> p.setKey("key-" + i)); + ComponentDto project = dbTester.components().insertPublicProject(p -> p.setKey("key-" + i)).getMainBranchComponent(); dbTester.users().insertProjectPermissionOnGroup(group, "perm-" + i, project); }); } private void createPublicProjects(int projectCount, boolean includeAnyonePerm) { IntStream.rangeClosed(1, projectCount).forEach(i -> { - ComponentDto project = dbTester.components().insertPublicProject(p -> p.setKey("key-" + i)); + ComponentDto project = dbTester.components().insertPublicProject(p -> p.setKey("key-" + i)).getMainBranchComponent(); if (includeAnyonePerm) { dbTester.users().insertProjectPermissionOnAnyone("perm-" + i, project); } diff --git a/server/sonar-webserver-core/src/test/java/org/sonar/server/qualitygate/ProjectsInWarningDaemonTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/qualitygate/ProjectsInWarningDaemonTest.java index 06332abf050..53be5452870 100644 --- a/server/sonar-webserver-core/src/test/java/org/sonar/server/qualitygate/ProjectsInWarningDaemonTest.java +++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/qualitygate/ProjectsInWarningDaemonTest.java @@ -209,7 +209,7 @@ public class ProjectsInWarningDaemonTest { } private ComponentDto insertProjectInWarning(MetricDto qualityGateStatus) { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); db.measures().insertLiveMeasure(project, qualityGateStatus, lm -> lm.setData(WARN.name()).setValue(null)); authorizationIndexerTester.allowOnlyAnyone(project); projectMeasuresIndexer.indexOnAnalysis(project.uuid()); diff --git a/server/sonar-webserver-core/src/test/java/org/sonar/server/telemetry/TelemetryDataLoaderImplTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/telemetry/TelemetryDataLoaderImplTest.java index d5cddf88838..d220c826d20 100644 --- a/server/sonar-webserver-core/src/test/java/org/sonar/server/telemetry/TelemetryDataLoaderImplTest.java +++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/telemetry/TelemetryDataLoaderImplTest.java @@ -156,7 +156,7 @@ public class TelemetryDataLoaderImplTest { MetricDto coverage = db.measures().insertMetric(m -> m.setKey(COVERAGE_KEY)); MetricDto nclocDistrib = db.measures().insertMetric(m -> m.setKey(NCLOC_LANGUAGE_DISTRIBUTION_KEY)); - ComponentDto project1 = db.components().insertPrivateProject(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); db.measures().insertLiveMeasure(project1, lines, m -> m.setValue(110d)); db.measures().insertLiveMeasure(project1, ncloc, m -> m.setValue(110d)); db.measures().insertLiveMeasure(project1, coverage, m -> m.setValue(80d)); @@ -167,7 +167,7 @@ public class TelemetryDataLoaderImplTest { db.measures().insertLiveMeasure(project1, developmentCostDto, m -> m.setData("50").setValue(null)); db.measures().insertLiveMeasure(project1, technicalDebtDto, m -> m.setValue(5d).setData((String) null)); - ComponentDto project2 = db.components().insertPrivateProject(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); db.measures().insertLiveMeasure(project2, lines, m -> m.setValue(200d)); db.measures().insertLiveMeasure(project2, ncloc, m -> m.setValue(200d)); db.measures().insertLiveMeasure(project2, coverage, m -> m.setValue(80d)); @@ -188,15 +188,15 @@ public class TelemetryDataLoaderImplTest { db.almSettings().insertGitHubAlmSetting(); AlmSettingDto almSettingDto = db.almSettings().insertAzureAlmSetting(a -> a.setUrl("https://dev.azure.com")); AlmSettingDto gitHubAlmSetting = db.almSettings().insertGitHubAlmSetting(a -> a.setUrl("https://api.github.com")); - db.almSettings().insertAzureProjectAlmSetting(almSettingDto, db.components().getProjectDto(project1)); - db.almSettings().insertGitlabProjectAlmSetting(gitHubAlmSetting, db.components().getProjectDto(project2)); + db.almSettings().insertAzureProjectAlmSetting(almSettingDto, db.components().getProjectDtoByMainBranch(project1)); + db.almSettings().insertGitlabProjectAlmSetting(gitHubAlmSetting, db.components().getProjectDtoByMainBranch(project2)); // quality gates QualityGateDto qualityGate1 = db.qualityGates().insertQualityGate(qg -> qg.setName("QG1").setBuiltIn(true)); QualityGateDto qualityGate2 = db.qualityGates().insertQualityGate(qg -> qg.setName("QG2")); // link one project to a non-default QG - db.qualityGates().associateProjectToQualityGate(db.components().getProjectDto(project1), qualityGate1); + db.qualityGates().associateProjectToQualityGate(db.components().getProjectDtoByMainBranch(project1), qualityGate1); TelemetryData data = communityUnderTest.load(); assertThat(data.getServerId()).isEqualTo(serverId); @@ -271,7 +271,7 @@ public class TelemetryDataLoaderImplTest { MetricDto coverage = db.measures().insertMetric(m -> m.setKey(COVERAGE_KEY)); MetricDto nclocDistrib = db.measures().insertMetric(m -> m.setKey(NCLOC_LANGUAGE_DISTRIBUTION_KEY)); - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); db.measures().insertLiveMeasure(project, lines, m -> m.setValue(110d)); db.measures().insertLiveMeasure(project, ncloc, m -> m.setValue(110d)); db.measures().insertLiveMeasure(project, coverage, m -> m.setValue(80d)); @@ -367,8 +367,8 @@ public class TelemetryDataLoaderImplTest { when(editionProvider.get()).thenReturn(Optional.of(COMMUNITY)); MetricDto unanalyzedC = db.measures().insertMetric(m -> m.setKey(UNANALYZED_C_KEY)); MetricDto unanalyzedCpp = db.measures().insertMetric(m -> m.setKey(UNANALYZED_CPP_KEY)); - ComponentDto project1 = db.components().insertPublicProject(); - ComponentDto project2 = db.components().insertPublicProject(); + ComponentDto project1 = db.components().insertPublicProject().getMainBranchComponent(); + ComponentDto project2 = db.components().insertPublicProject().getMainBranchComponent(); db.measures().insertLiveMeasure(project1, unanalyzedC); db.measures().insertLiveMeasure(project2, unanalyzedC); db.measures().insertLiveMeasure(project2, unanalyzedCpp); @@ -384,8 +384,8 @@ public class TelemetryDataLoaderImplTest { when(editionProvider.get()).thenReturn(Optional.of(DEVELOPER)); MetricDto unanalyzedC = db.measures().insertMetric(m -> m.setKey(UNANALYZED_C_KEY)); MetricDto unanalyzedCpp = db.measures().insertMetric(m -> m.setKey(UNANALYZED_CPP_KEY)); - ComponentDto project1 = db.components().insertPublicProject(); - ComponentDto project2 = db.components().insertPublicProject(); + ComponentDto project1 = db.components().insertPublicProject().getMainBranchComponent(); + ComponentDto project2 = db.components().insertPublicProject().getMainBranchComponent(); db.measures().insertLiveMeasure(project1, unanalyzedC); db.measures().insertLiveMeasure(project2, unanalyzedCpp); @@ -432,7 +432,7 @@ public class TelemetryDataLoaderImplTest { @Test public void undetected_alm_ci_slm_data() { server.setId("AU-TpxcB-iU5OvuD2FL7").setVersion("7.5.4"); - db.components().insertPublicProject(); + db.components().insertPublicProject().getMainBranchComponent(); TelemetryData data = communityUnderTest.load(); assertThat(data.getProjectStatistics()) .extracting(TelemetryData.ProjectStatistics::getDevopsPlatform, TelemetryData.ProjectStatistics::getScm, TelemetryData.ProjectStatistics::getCi) @@ -442,7 +442,7 @@ public class TelemetryDataLoaderImplTest { @Test @UseDataProvider("getScimFeatureStatues") public void detect_scim_feature_status(String isEnabled) { - db.components().insertPublicProject(); + db.components().insertPublicProject().getMainBranchComponent(); when(internalProperties.read(SCIM_PROPERTY_ENABLED)).thenReturn(Optional.ofNullable(isEnabled)); TelemetryData data = communityUnderTest.load(); @@ -452,7 +452,7 @@ public class TelemetryDataLoaderImplTest { @Test public void default_quality_gate_sent_with_project() { - db.components().insertPublicProject(); + db.components().insertPublicProject().getMainBranchComponent(); QualityGateDto qualityGate = db.qualityGates().insertQualityGate(qg -> qg.setName("anything").setBuiltIn(true)); db.qualityGates().setDefaultQualityGate(qualityGate); TelemetryData data = communityUnderTest.load(); diff --git a/server/sonar-webserver-es/src/it/java/org/sonar/server/permission/index/PermissionIndexerDaoIT.java b/server/sonar-webserver-es/src/it/java/org/sonar/server/permission/index/PermissionIndexerDaoIT.java index 021856dbc80..005832ba538 100644 --- a/server/sonar-webserver-es/src/it/java/org/sonar/server/permission/index/PermissionIndexerDaoIT.java +++ b/server/sonar-webserver-es/src/it/java/org/sonar/server/permission/index/PermissionIndexerDaoIT.java @@ -74,12 +74,12 @@ public class PermissionIndexerDaoIT { @Before public void setUp() { - publicProject = componentDbTester.insertPublicProject(); - privateProject1 = componentDbTester.insertPrivateProject(); - privateProject2 = componentDbTester.insertPrivateProject(); + publicProject = componentDbTester.insertPublicProject().getMainBranchComponent(); + privateProject1 = componentDbTester.insertPrivateProject().getMainBranchComponent(); + privateProject2 = componentDbTester.insertPrivateProject().getMainBranchComponent(); view1 = componentDbTester.insertPublicPortfolio(); view2 = componentDbTester.insertPublicPortfolio(); - application = componentDbTester.insertPublicApplication(); + application = componentDbTester.insertPublicApplication().getMainBranchComponent(); user1 = userDbTester.insertUser(); user2 = userDbTester.insertUser(); group = userDbTester.insertGroup(); @@ -164,7 +164,7 @@ public class PermissionIndexerDaoIT { public void select_by_projects_with_high_number_of_projects() { List projectUuids = new ArrayList<>(); for (int i = 0; i < 3500; i++) { - ComponentDto project = dbTester.components().insertPrivateProject(Integer.toString(i)); + ComponentDto project = dbTester.components().insertPrivateProject(Integer.toString(i)).getMainBranchComponent(); projectUuids.add(project.uuid()); GroupPermissionDto dto = new GroupPermissionDto() .setUuid(Uuids.createFast()) diff --git a/server/sonar-webserver-es/src/test/java/org/sonar/server/component/index/ComponentIndexScoreTest.java b/server/sonar-webserver-es/src/test/java/org/sonar/server/component/index/ComponentIndexScoreTest.java index a9243048871..847532a171c 100644 --- a/server/sonar-webserver-es/src/test/java/org/sonar/server/component/index/ComponentIndexScoreTest.java +++ b/server/sonar-webserver-es/src/test/java/org/sonar/server/component/index/ComponentIndexScoreTest.java @@ -113,10 +113,10 @@ public class ComponentIndexScoreTest extends ComponentIndexTest { @Test public void should_prefer_favorite_over_recently_browsed() { - ComponentDto file1 = db.components().insertPrivateProject(c -> c.setName("File1")); + ComponentDto file1 = db.components().insertPrivateProject(c -> c.setName("File1")).getMainBranchComponent(); index(file1); - ComponentDto file2 = db.components().insertPrivateProject(c -> c.setName("File2")); + ComponentDto file2 = db.components().insertPrivateProject(c -> c.setName("File2")).getMainBranchComponent(); index(file2); assertSearch(SuggestionQuery.builder() diff --git a/server/sonar-webserver-es/src/test/java/org/sonar/server/component/index/ComponentIndexSearchTest.java b/server/sonar-webserver-es/src/test/java/org/sonar/server/component/index/ComponentIndexSearchTest.java index 79c34112ce6..7d32bcd743d 100644 --- a/server/sonar-webserver-es/src/test/java/org/sonar/server/component/index/ComponentIndexSearchTest.java +++ b/server/sonar-webserver-es/src/test/java/org/sonar/server/component/index/ComponentIndexSearchTest.java @@ -55,8 +55,8 @@ public class ComponentIndexSearchTest { @Test public void filter_by_name() { - ComponentDto ignoredProject = db.components().insertPrivateProject(p -> p.setName("ignored project")); - ComponentDto project = db.components().insertPrivateProject(p -> p.setName("Project Shiny name")); + ComponentDto ignoredProject = db.components().insertPrivateProject(p -> p.setName("ignored project")).getMainBranchComponent(); + ComponentDto project = db.components().insertPrivateProject(p -> p.setName("Project Shiny name")).getMainBranchComponent(); index(ignoredProject, project); SearchIdResult result = underTest.search(ComponentQuery.builder().setQuery("shiny").build(), new SearchOptions()); @@ -66,9 +66,9 @@ public class ComponentIndexSearchTest { @Test public void filter_by_key_with_exact_match() { - ComponentDto ignoredProject = db.components().insertPrivateProject(p -> p.setKey("ignored-project")); - ComponentDto project = db.components().insertPrivateProject(p -> p.setKey("shiny-project")); - db.components().insertPrivateProject(p -> p.setKey("another-shiny-project")); + ComponentDto ignoredProject = db.components().insertPrivateProject(p -> p.setKey("ignored-project")).getMainBranchComponent(); + ComponentDto project = db.components().insertPrivateProject(p -> p.setKey("shiny-project")).getMainBranchComponent(); + db.components().insertPrivateProject(p -> p.setKey("another-shiny-project")).getMainBranchComponent(); index(ignoredProject, project); SearchIdResult result = underTest.search(ComponentQuery.builder().setQuery("shiny-project").build(), new SearchOptions()); @@ -78,7 +78,7 @@ public class ComponentIndexSearchTest { @Test public void filter_by_qualifier() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto portfolio = db.components().insertPrivatePortfolio(); index(project); index(portfolio); @@ -90,9 +90,9 @@ public class ComponentIndexSearchTest { @Test public void order_by_name_case_insensitive() { - ComponentDto project2 = db.components().insertPrivateProject(p -> p.setName("PROJECT 2")); - ComponentDto project3 = db.components().insertPrivateProject(p -> p.setName("project 3")); - ComponentDto project1 = db.components().insertPrivateProject(p -> p.setName("Project 1")); + ComponentDto project2 = db.components().insertPrivateProject(p -> p.setName("PROJECT 2")).getMainBranchComponent(); + ComponentDto project3 = db.components().insertPrivateProject(p -> p.setName("project 3")).getMainBranchComponent(); + ComponentDto project1 = db.components().insertPrivateProject(p -> p.setName("Project 1")).getMainBranchComponent(); index(project1, project2, project3); SearchIdResult result = underTest.search(ComponentQuery.builder().build(), new SearchOptions()); @@ -103,7 +103,7 @@ public class ComponentIndexSearchTest { @Test public void paginate_results() { List projects = IntStream.range(0, 9) - .mapToObj(i -> db.components().insertPrivateProject(p -> p.setName("project " + i))) + .mapToObj(i -> db.components().insertPrivateProject(p -> p.setName("project " + i)).getMainBranchComponent()) .toList(); index(projects.toArray(new ComponentDto[0])); @@ -114,9 +114,9 @@ public class ComponentIndexSearchTest { @Test public void filter_unauthorized_components() { - ComponentDto unauthorizedProject = db.components().insertPrivateProject(); - ComponentDto project1 = db.components().insertPrivateProject(); - ComponentDto project2 = db.components().insertPrivateProject(); + ComponentDto unauthorizedProject = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); indexer.indexAll(); authorizationIndexerTester.allowOnlyAnyone(project1); authorizationIndexerTester.allowOnlyAnyone(project2); diff --git a/server/sonar-webserver-es/src/test/java/org/sonar/server/issue/index/IssueIndexFiltersTest.java b/server/sonar-webserver-es/src/test/java/org/sonar/server/issue/index/IssueIndexFiltersTest.java index a608ff5e985..93775cac984 100644 --- a/server/sonar-webserver-es/src/test/java/org/sonar/server/issue/index/IssueIndexFiltersTest.java +++ b/server/sonar-webserver-es/src/test/java/org/sonar/server/issue/index/IssueIndexFiltersTest.java @@ -129,11 +129,11 @@ public class IssueIndexFiltersTest extends IssueIndexTestCommon { @Test public void filter_by_portfolios() { - ComponentDto portfolio1 = db.components().insertPrivateApplication(); - ComponentDto portfolio2 = db.components().insertPrivateApplication(); - ComponentDto project1 = db.components().insertPrivateProject(); + ComponentDto portfolio1 = db.components().insertPrivateApplication().getMainBranchComponent(); + ComponentDto portfolio2 = db.components().insertPrivateApplication().getMainBranchComponent(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project1)); - ComponentDto project2 = db.components().insertPrivateProject(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); IssueDoc issueOnProject1 = newDocForProject(project1); IssueDoc issueOnFile = newDoc(file, project1.uuid()); @@ -165,8 +165,8 @@ public class IssueIndexFiltersTest extends IssueIndexTestCommon { @Test public void do_not_return_issues_from_project_branch_when_filtering_by_portfolios() { - ComponentDto portfolio = db.components().insertPrivateApplication(); - ComponentDto project = db.components().insertPublicProject(); + ComponentDto portfolio = db.components().insertPrivateApplication().getMainBranchComponent(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto projectBranch = db.components().insertProjectBranch(project); ComponentDto fileOnProjectBranch = db.components().insertComponent(newFileDto(projectBranch)); indexView(portfolio.uuid(), singletonList(project.uuid())); @@ -184,7 +184,7 @@ public class IssueIndexFiltersTest extends IssueIndexTestCommon { @Test public void filter_one_issue_by_project_and_branch() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto branch = db.components().insertProjectBranch(project); ComponentDto anotherbBranch = db.components().insertProjectBranch(project); @@ -206,7 +206,7 @@ public class IssueIndexFiltersTest extends IssueIndexTestCommon { @Test public void issues_from_branch_component_children() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto projectFile = db.components().insertComponent(newFileDto(project)); ComponentDto branch = db.components().insertProjectBranch(project, b -> b.setKey("my_branch")); ComponentDto branchFile = db.components().insertComponent(newFileDto(branch, project.uuid())).setMainBranchProjectUuid(project.uuid()); @@ -224,7 +224,7 @@ public class IssueIndexFiltersTest extends IssueIndexTestCommon { @Test public void issues_from_main_branch() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto branch = db.components().insertProjectBranch(project); IssueDoc issueOnProject = newDocForProject(project); @@ -241,7 +241,7 @@ public class IssueIndexFiltersTest extends IssueIndexTestCommon { @Test public void branch_issues_are_ignored_when_no_branch_param() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto branch = db.components().insertProjectBranch(project, b -> b.setKey("my_branch")); IssueDoc projectIssue = newDocForProject(project); @@ -253,11 +253,11 @@ public class IssueIndexFiltersTest extends IssueIndexTestCommon { @Test public void filter_by_main_application() { - ComponentDto application1 = db.components().insertPrivateApplication(); - ComponentDto application2 = db.components().insertPrivateApplication(); - ComponentDto project1 = db.components().insertPrivateProject(); + ComponentDto application1 = db.components().insertPrivateApplication().getMainBranchComponent(); + ComponentDto application2 = db.components().insertPrivateApplication().getMainBranchComponent(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project1)); - ComponentDto project2 = db.components().insertPrivateProject(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); indexView(application1.uuid(), singletonList(project1.uuid())); indexView(application2.uuid(), singletonList(project2.uuid())); @@ -277,12 +277,12 @@ public class IssueIndexFiltersTest extends IssueIndexTestCommon { @Test public void filter_by_application_branch() { - ComponentDto application = db.components().insertPublicProject(c -> c.setQualifier(APP)); + ComponentDto application = db.components().insertPublicProject(c -> c.setQualifier(APP)).getMainBranchComponent(); ComponentDto branch1 = db.components().insertProjectBranch(application); ComponentDto branch2 = db.components().insertProjectBranch(application); - ComponentDto project1 = db.components().insertPrivateProject(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project1)); - ComponentDto project2 = db.components().insertPrivateProject(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); indexView(branch1.uuid(), singletonList(project1.uuid())); indexView(branch2.uuid(), singletonList(project2.uuid())); @@ -303,14 +303,14 @@ public class IssueIndexFiltersTest extends IssueIndexTestCommon { @Test public void filter_by_application_branch_having_project_branches() { - ComponentDto application = db.components().insertPublicProject(c -> c.setQualifier(APP).setKey("app")); + ComponentDto application = db.components().insertPublicProject(c -> c.setQualifier(APP).setKey("app")).getMainBranchComponent(); ComponentDto applicationBranch1 = db.components().insertProjectBranch(application, a -> a.setKey("app-branch1")); ComponentDto applicationBranch2 = db.components().insertProjectBranch(application, a -> a.setKey("app-branch2")); - ComponentDto project1 = db.components().insertPrivateProject(p -> p.setKey("prj1")); + ComponentDto project1 = db.components().insertPrivateProject(p -> p.setKey("prj1")).getMainBranchComponent(); ComponentDto project1Branch1 = db.components().insertProjectBranch(project1); ComponentDto fileOnProject1Branch1 = db.components().insertComponent(newFileDto(project1Branch1)).setMainBranchProjectUuid(project1.uuid()); ComponentDto project1Branch2 = db.components().insertProjectBranch(project1); - ComponentDto project2 = db.components().insertPrivateProject(p -> p.setKey("prj2")); + ComponentDto project2 = db.components().insertPrivateProject(p -> p.setKey("prj2")).getMainBranchComponent(); indexView(applicationBranch1.uuid(), asList(project1Branch1.uuid(), project2.uuid())); indexView(applicationBranch2.uuid(), singletonList(project1Branch2.uuid())); diff --git a/server/sonar-webserver-es/src/test/java/org/sonar/server/issue/index/IssueIndexSecurityReportsTest.java b/server/sonar-webserver-es/src/test/java/org/sonar/server/issue/index/IssueIndexSecurityReportsTest.java index 3f05442eae0..657622b5d9e 100644 --- a/server/sonar-webserver-es/src/test/java/org/sonar/server/issue/index/IssueIndexSecurityReportsTest.java +++ b/server/sonar-webserver-es/src/test/java/org/sonar/server/issue/index/IssueIndexSecurityReportsTest.java @@ -471,10 +471,10 @@ public class IssueIndexSecurityReportsTest extends IssueIndexTestCommon { @Test public void getPciDssReport_aggregation_on_portfolio() { - ComponentDto portfolio1 = db.components().insertPrivateApplication(); - ComponentDto portfolio2 = db.components().insertPrivateApplication(); - ComponentDto project1 = db.components().insertPrivateProject(); - ComponentDto project2 = db.components().insertPrivateProject(); + ComponentDto portfolio1 = db.components().insertPrivateApplication().getMainBranchComponent(); + ComponentDto portfolio2 = db.components().insertPrivateApplication().getMainBranchComponent(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); indexIssues( newDocForProject("openvul1", project1).setPciDss32(asList("1.2.0", "3.4.5")).setType(RuleType.VULNERABILITY).setStatus(Issue.STATUS_OPEN) @@ -518,10 +518,10 @@ public class IssueIndexSecurityReportsTest extends IssueIndexTestCommon { @Test public void getOwaspAsvsReport_aggregation_on_portfolio() { - ComponentDto portfolio1 = db.components().insertPrivateApplication(); - ComponentDto portfolio2 = db.components().insertPrivateApplication(); - ComponentDto project1 = db.components().insertPrivateProject(); - ComponentDto project2 = db.components().insertPrivateProject(); + ComponentDto portfolio1 = db.components().insertPrivateApplication().getMainBranchComponent(); + ComponentDto portfolio2 = db.components().insertPrivateApplication().getMainBranchComponent(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); indexIssues( newDocForProject("openvul1", project1).setOwaspAsvs40(asList("2.1.1", "3.4.5")).setType(RuleType.VULNERABILITY).setStatus(Issue.STATUS_OPEN) @@ -647,9 +647,9 @@ public class IssueIndexSecurityReportsTest extends IssueIndexTestCommon { @Test public void getCWETop25Report_aggregation_on_portfolio() { - ComponentDto application = db.components().insertPrivateApplication(); - ComponentDto project1 = db.components().insertPrivateProject(); - ComponentDto project2 = db.components().insertPrivateProject(); + ComponentDto application = db.components().insertPrivateApplication().getMainBranchComponent(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); indexIssues( newDocForProject("openvul1", project1).setCwe(List.of("119")).setType(RuleType.VULNERABILITY).setStatus(Issue.STATUS_OPEN) diff --git a/server/sonar-webserver-es/src/test/java/org/sonar/server/issue/index/IssueIndexSyncProgressCheckerTest.java b/server/sonar-webserver-es/src/test/java/org/sonar/server/issue/index/IssueIndexSyncProgressCheckerTest.java index 79b60af36b9..01fa2e76dda 100644 --- a/server/sonar-webserver-es/src/test/java/org/sonar/server/issue/index/IssueIndexSyncProgressCheckerTest.java +++ b/server/sonar-webserver-es/src/test/java/org/sonar/server/issue/index/IssueIndexSyncProgressCheckerTest.java @@ -257,7 +257,7 @@ public class IssueIndexSyncProgressCheckerTest { public void checkIfAnyComponentsNeedIssueSync_single_view_subview_or_app() { ProjectDto projectDto1 = insertProjectWithBranches(true, 0); - ComponentDto app = db.components().insertPublicApplication(); + ComponentDto app = db.components().insertPublicApplication().getMainBranchComponent(); ComponentDto view = db.components().insertPrivatePortfolio(); ComponentDto subview = db.components().insertSubView(view); @@ -307,9 +307,9 @@ public class IssueIndexSyncProgressCheckerTest { private ProjectDto insertProjectWithBranches(boolean needIssueSync, int numberOfBranches) { ProjectDto projectDto = db.components() - .insertPrivateProjectDto(branchDto -> branchDto.setNeedIssueSync(needIssueSync), c -> { + .insertPrivateProject(branchDto -> branchDto.setNeedIssueSync(needIssueSync), c -> { }, p -> { - }); + }).getProjectDto(); IntStream.range(0, numberOfBranches).forEach( i -> db.components().insertProjectBranch(projectDto, branchDto -> branchDto.setNeedIssueSync(needIssueSync))); return projectDto; diff --git a/server/sonar-webserver-es/src/test/java/org/sonar/server/issue/index/IssueQueryFactoryTest.java b/server/sonar-webserver-es/src/test/java/org/sonar/server/issue/index/IssueQueryFactoryTest.java index 9627bcbbbc0..219f54b7c1f 100644 --- a/server/sonar-webserver-es/src/test/java/org/sonar/server/issue/index/IssueQueryFactoryTest.java +++ b/server/sonar-webserver-es/src/test/java/org/sonar/server/issue/index/IssueQueryFactoryTest.java @@ -80,7 +80,7 @@ public class IssueQueryFactoryTest { public void create_from_parameters() { String ruleAdHocName = "New Name"; UserDto user = db.users().insertUser(u -> u.setLogin("joanna")); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); RuleDto rule1 = ruleDbTester.insert(r -> r.setAdHocName(ruleAdHocName)); @@ -135,7 +135,7 @@ public class IssueQueryFactoryTest { @Test public void create_with_rule_key_that_does_not_exist_in_the_db() { db.users().insertUser(u -> u.setLogin("joanna")); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); db.components().insertComponent(newFileDto(project)); newRule(RuleKey.of("findbugs", "NullReference")); SearchRequest request = new SearchRequest() @@ -151,7 +151,7 @@ public class IssueQueryFactoryTest { public void in_new_code_period_start_date_is_exclusive() { long newCodePeriodStart = addDays(new Date(), -14).getTime(); - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); SnapshotDto analysis = db.components().insertSnapshot(project, s -> s.setPeriodDate(newCodePeriodStart)); @@ -171,7 +171,7 @@ public class IssueQueryFactoryTest { @Test public void new_code_period_does_not_rely_on_date_for_reference_branch_with_analysis_after_sonarqube_94() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); db.components().insertSnapshot(project, s -> s.setPeriodMode(REFERENCE_BRANCH.name()) @@ -309,9 +309,9 @@ public class IssueQueryFactoryTest { @Test public void application_search_project_issues() { - ComponentDto project1 = db.components().insertPublicProject(); - ComponentDto project2 = db.components().insertPublicProject(); - ComponentDto application = db.components().insertPublicApplication(); + ComponentDto project1 = db.components().insertPublicProject().getMainBranchComponent(); + ComponentDto project2 = db.components().insertPublicProject().getMainBranchComponent(); + ComponentDto application = db.components().insertPublicApplication().getMainBranchComponent(); db.components().insertComponents(newProjectCopy("PC1", project1, application)); db.components().insertComponents(newProjectCopy("PC2", project2, application)); userSession.registerApplication(application, project1, project2); @@ -323,9 +323,9 @@ public class IssueQueryFactoryTest { @Test public void application_search_project_issues_returns_empty_if_user_cannot_access_child_projects() { - ComponentDto project1 = db.components().insertPrivateProject(); - ComponentDto project2 = db.components().insertPrivateProject(); - ComponentDto application = db.components().insertPublicApplication(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto application = db.components().insertPublicApplication().getMainBranchComponent(); db.components().insertComponents(newProjectCopy("PC1", project1, application)); db.components().insertComponents(newProjectCopy("PC2", project2, application)); @@ -338,15 +338,15 @@ public class IssueQueryFactoryTest { public void application_search_project_issues_in_new_code_with_and_without_analysis_after_sonarqube_94() { Date now = new Date(); when(clock.millis()).thenReturn(now.getTime()); - ComponentDto project1 = db.components().insertPublicProject(); + ComponentDto project1 = db.components().insertPublicProject().getMainBranchComponent(); SnapshotDto analysis1 = db.components().insertSnapshot(project1, s -> s.setPeriodDate(addDays(now, -14).getTime())); - ComponentDto project2 = db.components().insertPublicProject(); + ComponentDto project2 = db.components().insertPublicProject().getMainBranchComponent(); db.components().insertSnapshot(project2, s -> s.setPeriodDate(null)); - ComponentDto project3 = db.components().insertPublicProject(); - ComponentDto project4 = db.components().insertPublicProject(); + ComponentDto project3 = db.components().insertPublicProject().getMainBranchComponent(); + ComponentDto project4 = db.components().insertPublicProject().getMainBranchComponent(); SnapshotDto analysis2 = db.components().insertSnapshot(project4, s -> s.setPeriodMode(REFERENCE_BRANCH.name()).setPeriodParam("master")); - ComponentDto application = db.components().insertPublicApplication(); + ComponentDto application = db.components().insertPublicApplication().getMainBranchComponent(); MetricDto analysisMetric = db.measures().insertMetric(m -> m.setKey(ANALYSIS_FROM_SONARQUBE_9_4_KEY)); db.measures().insertLiveMeasure(project4, analysisMetric, measure -> measure.setData("true")); db.components().insertComponents(newProjectCopy("PC1", project1, application)); @@ -381,7 +381,7 @@ public class IssueQueryFactoryTest { @Test public void param_componentUuids_enables_search_on_project_tree_by_default() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); SearchRequest request = new SearchRequest() .setComponentUuids(asList(project.uuid())); @@ -392,7 +392,7 @@ public class IssueQueryFactoryTest { @Test public void onComponentOnly_restricts_search_to_specified_componentKeys() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); SearchRequest request = new SearchRequest() .setComponents(asList(project.getKey())) .setOnComponentOnly(true); @@ -406,7 +406,7 @@ public class IssueQueryFactoryTest { @Test public void param_componentUuids_enables_search_in_directory_tree() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto dir = db.components().insertComponent(newDirectory(project, "src/main/java/foo")); SearchRequest request = new SearchRequest() .setComponentUuids(asList(dir.uuid())); @@ -419,7 +419,7 @@ public class IssueQueryFactoryTest { @Test public void param_componentUuids_enables_search_by_file() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); SearchRequest request = new SearchRequest() .setComponentUuids(asList(file.uuid())); @@ -431,7 +431,7 @@ public class IssueQueryFactoryTest { @Test public void param_componentUuids_enables_search_by_test_file() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project).setQualifier(Qualifiers.UNIT_TEST_FILE)); SearchRequest request = new SearchRequest() .setComponentUuids(asList(file.uuid())); @@ -443,7 +443,7 @@ public class IssueQueryFactoryTest { @Test public void search_issue_from_branch() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); String branchName = randomAlphanumeric(248); ComponentDto branch = db.components().insertProjectBranch(project, b -> b.setKey(branchName)); @@ -462,7 +462,7 @@ public class IssueQueryFactoryTest { @Test public void search_file_issue_from_branch() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); String branchName = randomAlphanumeric(248); ComponentDto branch = db.components().insertProjectBranch(project, b -> b.setKey(branchName)); ComponentDto file = db.components().insertComponent(newFileDto(branch, project.uuid())); @@ -490,7 +490,7 @@ public class IssueQueryFactoryTest { @Test public void search_issue_on_component_only_from_branch() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); String branchName = randomAlphanumeric(248); ComponentDto branch = db.components().insertProjectBranch(project, b -> b.setKey(branchName)); ComponentDto file = db.components().insertComponent(newFileDto(branch, project.uuid())); @@ -505,7 +505,7 @@ public class IssueQueryFactoryTest { @Test public void search_issues_from_main_branch() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); db.components().insertProjectBranch(project); assertThat(underTest.create(new SearchRequest() @@ -522,9 +522,9 @@ public class IssueQueryFactoryTest { @Test public void search_by_application_key() { - ComponentDto application = db.components().insertPrivateApplication(); - ComponentDto project1 = db.components().insertPrivateProject(); - ComponentDto project2 = db.components().insertPrivateProject(); + ComponentDto application = db.components().insertPrivateApplication().getMainBranchComponent(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); db.components().insertComponents(newProjectCopy(project1, application)); db.components().insertComponents(newProjectCopy(project2, application)); userSession.registerApplication(application, project1, project2) @@ -539,16 +539,16 @@ public class IssueQueryFactoryTest { @Test public void search_by_application_key_and_branch() { - ComponentDto application = db.components().insertPublicProject(c -> c.setQualifier(APP).setKey("app")); + ComponentDto application = db.components().insertPublicProject(c -> c.setQualifier(APP).setKey("app")).getMainBranchComponent(); String branchName1 = "app-branch1"; String branchName2 = "app-branch2"; ComponentDto applicationBranch1 = db.components().insertProjectBranch(application, a -> a.setKey(branchName1)); ComponentDto applicationBranch2 = db.components().insertProjectBranch(application, a -> a.setKey(branchName2)); - ComponentDto project1 = db.components().insertPrivateProject(p -> p.setKey("prj1")); + ComponentDto project1 = db.components().insertPrivateProject(p -> p.setKey("prj1")).getMainBranchComponent(); ComponentDto project1Branch1 = db.components().insertProjectBranch(project1); db.components().insertComponent(newFileDto(project1Branch1, project1.uuid())); ComponentDto project1Branch2 = db.components().insertProjectBranch(project1); - ComponentDto project2 = db.components().insertPrivateProject(p -> p.setKey("prj2")); + ComponentDto project2 = db.components().insertPrivateProject(p -> p.setKey("prj2")).getMainBranchComponent(); db.components().insertComponents(newProjectCopy(project1Branch1, applicationBranch1)); db.components().insertComponents(newProjectCopy(project2, applicationBranch1)); db.components().insertComponents(newProjectCopy(project1Branch2, applicationBranch2)); @@ -635,8 +635,8 @@ public class IssueQueryFactoryTest { @Test public void fail_if_several_components_provided_with_in_new_code_period() { - ComponentDto project1 = db.components().insertPrivateProject(); - ComponentDto project2 = db.components().insertPrivateProject(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); SearchRequest searchRequest = new SearchRequest() .setInNewCodePeriod(true) diff --git a/server/sonar-webserver-es/src/test/java/org/sonar/server/permission/index/PermissionIndexerTest.java b/server/sonar-webserver-es/src/test/java/org/sonar/server/permission/index/PermissionIndexerTest.java index 8862f30034f..e5652b5ff25 100644 --- a/server/sonar-webserver-es/src/test/java/org/sonar/server/permission/index/PermissionIndexerTest.java +++ b/server/sonar-webserver-es/src/test/java/org/sonar/server/permission/index/PermissionIndexerTest.java @@ -398,17 +398,17 @@ public class PermissionIndexerTest { } private ComponentDto createUnindexedPublicProject() { - return db.components().insertPublicProject(); + return db.components().insertPublicProject().getMainBranchComponent(); } private ComponentDto createAndIndexPrivateProject() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); fooIndexer.indexOnAnalysis(project.uuid()); return project; } private ComponentDto createAndIndexPublicProject() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); fooIndexer.indexOnAnalysis(project.uuid()); return project; } diff --git a/server/sonar-webserver-pushapi/src/test/java/org/sonar/server/pushapi/issues/IssueChangeEventServiceImplTest.java b/server/sonar-webserver-pushapi/src/test/java/org/sonar/server/pushapi/issues/IssueChangeEventServiceImplTest.java index aea2f0aed80..b3ebcac7130 100644 --- a/server/sonar-webserver-pushapi/src/test/java/org/sonar/server/pushapi/issues/IssueChangeEventServiceImplTest.java +++ b/server/sonar-webserver-pushapi/src/test/java/org/sonar/server/pushapi/issues/IssueChangeEventServiceImplTest.java @@ -64,7 +64,7 @@ public class IssueChangeEventServiceImplTest { @Test public void distributeIssueChangeEvent_singleIssueChange_severityChange() { - ComponentDto componentDto = db.components().insertPublicProject(); + ComponentDto componentDto = db.components().insertPublicProject().getMainBranchComponent(); ProjectDto project = db.getDbClient().projectDao().selectByUuid(db.getSession(), componentDto.uuid()).get(); BranchDto branch = db.getDbClient().branchDao().selectByUuid(db.getSession(), project.getUuid()).get(); RuleDto rule = db.rules().insert(); @@ -75,7 +75,7 @@ public class IssueChangeEventServiceImplTest { @Test public void distributeIssueChangeEvent_singleIssueChange_typeChange() { - ComponentDto componentDto = db.components().insertPublicProject(); + ComponentDto componentDto = db.components().insertPublicProject().getMainBranchComponent(); ProjectDto project = db.getDbClient().projectDao().selectByUuid(db.getSession(), componentDto.uuid()).get(); BranchDto branch = db.getDbClient().branchDao().selectByUuid(db.getSession(), project.getUuid()).get(); RuleDto rule = db.rules().insert(); @@ -86,7 +86,7 @@ public class IssueChangeEventServiceImplTest { @Test public void distributeIssueChangeEvent_singleIssueChange_transitionChanges() { - ComponentDto componentDto = db.components().insertPublicProject(); + ComponentDto componentDto = db.components().insertPublicProject().getMainBranchComponent(); ProjectDto project = db.getDbClient().projectDao().selectByUuid(db.getSession(), componentDto.uuid()).get(); BranchDto branch = db.getDbClient().branchDao().selectByUuid(db.getSession(), project.getUuid()).get(); RuleDto rule = db.rules().insert(); @@ -104,7 +104,7 @@ public class IssueChangeEventServiceImplTest { @Test public void distributeIssueChangeEvent_singleIssueChange_severalChanges() { - ComponentDto componentDto = db.components().insertPublicProject(); + ComponentDto componentDto = db.components().insertPublicProject().getMainBranchComponent(); ProjectDto project = db.getDbClient().projectDao().selectByUuid(db.getSession(), componentDto.uuid()).get(); BranchDto branch = db.getDbClient().branchDao().selectByUuid(db.getSession(), project.getUuid()).get(); RuleDto rule = db.rules().insert(); @@ -117,17 +117,17 @@ public class IssueChangeEventServiceImplTest { public void distributeIssueChangeEvent_bulkIssueChange() { RuleDto rule = db.rules().insert(); - ComponentDto componentDto1 = db.components().insertPublicProject(); + ComponentDto componentDto1 = db.components().insertPublicProject().getMainBranchComponent(); ProjectDto project1 = db.getDbClient().projectDao().selectByUuid(db.getSession(), componentDto1.uuid()).get(); BranchDto branch1 = db.getDbClient().branchDao().selectByUuid(db.getSession(), project1.getUuid()).get(); IssueDto issue1 = db.issues().insert(rule, project1, componentDto1, i -> i.setSeverity(MAJOR.name()).setType(RuleType.BUG)); - ComponentDto componentDto2 = db.components().insertPublicProject(); + ComponentDto componentDto2 = db.components().insertPublicProject().getMainBranchComponent(); ProjectDto project2 = db.getDbClient().projectDao().selectByUuid(db.getSession(), componentDto2.uuid()).get(); BranchDto branch2 = db.getDbClient().branchDao().selectByUuid(db.getSession(), project2.getUuid()).get(); IssueDto issue2 = db.issues().insert(rule, project2, componentDto2, i -> i.setSeverity(MAJOR.name()).setType(RuleType.BUG)); - ComponentDto componentDto3 = db.components().insertPublicProject(); + ComponentDto componentDto3 = db.components().insertPublicProject().getMainBranchComponent(); ProjectDto project3 = db.getDbClient().projectDao().selectByUuid(db.getSession(), componentDto3.uuid()).get(); BranchDto branch3 = db.getDbClient().branchDao().selectByUuid(db.getSession(), project3.getUuid()).get(); IssueDto issue3 = db.issues().insert(rule, project3, componentDto3, i -> i.setSeverity(MAJOR.name()).setType(RuleType.BUG)); @@ -188,7 +188,7 @@ public class IssueChangeEventServiceImplTest { public void doNotDistributeIssueChangeEvent_forPullRequestIssues() { RuleDto rule = db.rules().insert(); - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto pullRequest = db.components().insertProjectBranch(project, b -> b.setKey("myBranch1") .setBranchType(BranchType.PULL_REQUEST) .setMergeBranchUuid(project.uuid())); diff --git a/server/sonar-webserver-pushapi/src/test/java/org/sonar/server/pushapi/qualityprofile/QualityProfileChangeEventServiceImplTest.java b/server/sonar-webserver-pushapi/src/test/java/org/sonar/server/pushapi/qualityprofile/QualityProfileChangeEventServiceImplTest.java index 0bbe233ba1c..0a455a38324 100644 --- a/server/sonar-webserver-pushapi/src/test/java/org/sonar/server/pushapi/qualityprofile/QualityProfileChangeEventServiceImplTest.java +++ b/server/sonar-webserver-pushapi/src/test/java/org/sonar/server/pushapi/qualityprofile/QualityProfileChangeEventServiceImplTest.java @@ -79,7 +79,7 @@ public class QualityProfileChangeEventServiceImplTest { Collection profiles = Collections.singleton(qualityProfileDto); - ProjectDto project = db.components().insertPrivateProjectDto(); + ProjectDto project = db.components().insertPrivateProject().getProjectDto(); db.qualityProfiles().associateWithProject(project, qualityProfileDto); underTest.distributeRuleChangeEvent(profiles, of(activeRuleChange), "xoo"); @@ -104,7 +104,7 @@ public class QualityProfileChangeEventServiceImplTest { @Test public void distributeRuleChangeEvent_when_project_has_only_default_quality_profiles() { String language = "xoo"; - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); RuleDto templateRule = insertTemplateRule(); QProfileDto defaultQualityProfile = insertDefaultQualityProfile(language); RuleDto rule = insertCustomRule(templateRule, language, "
line1\nline2
"); diff --git a/server/sonar-webserver-pushapi/src/test/java/org/sonar/server/pushapi/scheduler/polling/PushEventPollSchedulerTest.java b/server/sonar-webserver-pushapi/src/test/java/org/sonar/server/pushapi/scheduler/polling/PushEventPollSchedulerTest.java index 61224b4e1de..c50a12f9475 100644 --- a/server/sonar-webserver-pushapi/src/test/java/org/sonar/server/pushapi/scheduler/polling/PushEventPollSchedulerTest.java +++ b/server/sonar-webserver-pushapi/src/test/java/org/sonar/server/pushapi/scheduler/polling/PushEventPollSchedulerTest.java @@ -86,7 +86,7 @@ public class PushEventPollSchedulerTest { @Test public void nothing_to_broadcast_when_no_push_events() { - var project = db.components().insertPrivateProject(); + var project = db.components().insertPrivateProject().getMainBranchComponent(); var sonarLintClient = mock(SonarLintClient.class); when(sonarLintClient.getClientProjectUuids()).thenReturn(Set.of(project.uuid())); @@ -102,7 +102,7 @@ public class PushEventPollSchedulerTest { @Test public void nothing_to_broadcast_if_project_key_does_not_exist() { - var project = db.components().insertPrivateProject(); + var project = db.components().insertPrivateProject().getMainBranchComponent(); system2.setNow(1L); var sonarLintClient = mock(SonarLintClient.class); @@ -124,7 +124,7 @@ public class PushEventPollSchedulerTest { @Test public void broadcast_push_events() { - var project = db.components().insertPrivateProject(); + var project = db.components().insertPrivateProject().getMainBranchComponent(); system2.setNow(1L); var sonarLintClient = mock(SonarLintClient.class); @@ -160,7 +160,7 @@ public class PushEventPollSchedulerTest { @Test public void broadcast_should_stop_polling_for_events_when_all_clients_unregister() { - var project = db.components().insertPrivateProject(); + var project = db.components().insertPrivateProject().getMainBranchComponent(); system2.setNow(1L); var sonarLintClient = mock(SonarLintClient.class); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/almintegration/ws/azure/ImportAzureProjectActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/almintegration/ws/azure/ImportAzureProjectActionIT.java index 2dcad2a53bb..f3dbac58dbe 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/almintegration/ws/azure/ImportAzureProjectActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/almintegration/ws/azure/ImportAzureProjectActionIT.java @@ -249,7 +249,7 @@ public class ImportAzureProjectActionIT { dto.setUserUuid(user.getUuid()); }); GsonAzureRepo repo = getGsonAzureRepo(); - db.components().insertPublicProject(p -> p.setKey(GENERATED_PROJECT_KEY)); + db.components().insertPublicProject(p -> p.setKey(GENERATED_PROJECT_KEY)).getMainBranchComponent(); when(azureDevOpsHttpClient.getRepo(almSetting.getUrl(), almSetting.getDecryptedPersonalAccessToken(encryption), "project-name", "repo-name")).thenReturn(repo); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/almintegration/ws/azure/SearchAzureReposActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/almintegration/ws/azure/SearchAzureReposActionIT.java index d3b2d0f9af9..cd7e3d4f465 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/almintegration/ws/azure/SearchAzureReposActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/almintegration/ws/azure/SearchAzureReposActionIT.java @@ -334,7 +334,7 @@ public class SearchAzureReposActionIT { } private ProjectDto insertProject(AlmSettingDto almSetting, String repoName, String projectName) { - ProjectDto projectDto1 = db.components().insertPrivateProjectDto(); + ProjectDto projectDto1 = db.components().insertPrivateProject().getProjectDto(); db.almSettings().insertAzureProjectAlmSetting(almSetting, projectDto1, projectAlmSettingDto -> projectAlmSettingDto.setAlmRepo(repoName), projectAlmSettingDto -> projectAlmSettingDto.setAlmSlug(projectName)); return projectDto1; diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/almintegration/ws/bitbucketcloud/ImportBitbucketCloudRepoActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/almintegration/ws/bitbucketcloud/ImportBitbucketCloudRepoActionIT.java index 957e35488e0..90d4187372e 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/almintegration/ws/bitbucketcloud/ImportBitbucketCloudRepoActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/almintegration/ws/bitbucketcloud/ImportBitbucketCloudRepoActionIT.java @@ -140,7 +140,7 @@ public class ImportBitbucketCloudRepoActionIT { dto.setUserUuid(user.getUuid()); }); Repository repo = getGsonBBCRepo(); - db.components().insertPublicProject(p -> p.setKey(GENERATED_PROJECT_KEY)); + db.components().insertPublicProject(p -> p.setKey(GENERATED_PROJECT_KEY)).getMainBranchComponent(); when(bitbucketCloudRestClient.getRepo(any(), any(), any())).thenReturn(repo); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/almintegration/ws/bitbucketcloud/SearchBitbucketCloudReposActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/almintegration/ws/bitbucketcloud/SearchBitbucketCloudReposActionIT.java index 044e4e74014..288f4c5537c 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/almintegration/ws/bitbucketcloud/SearchBitbucketCloudReposActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/almintegration/ws/bitbucketcloud/SearchBitbucketCloudReposActionIT.java @@ -76,7 +76,7 @@ public class SearchBitbucketCloudReposActionIT { dto.setPersonalAccessToken("abc:xyz"); dto.setUserUuid(user.getUuid()); }); - ProjectDto projectDto = db.components().insertPrivateProjectDto(); + ProjectDto projectDto = db.components().insertPrivateProject().getProjectDto(); db.almSettings().insertBitbucketCloudProjectAlmSetting(almSetting, projectDto, s -> s.setAlmRepo("repo-slug-2")); SearchBitbucketcloudReposWsResponse response = ws.newRequest() @@ -105,8 +105,8 @@ public class SearchBitbucketCloudReposActionIT { dto.setAlmSettingUuid(almSetting.getUuid()); dto.setUserUuid(user.getUuid()); }); - ProjectDto project1 = db.components().insertPrivateProjectDto(p -> p.setKey("B")); - ProjectDto project2 = db.components().insertPrivateProjectDto(p -> p.setKey("A")); + ProjectDto project1 = db.components().insertPrivateProject(p -> p.setKey("B")).getProjectDto(); + ProjectDto project2 = db.components().insertPrivateProject(p -> p.setKey("A")).getProjectDto(); db.almSettings().insertBitbucketProjectAlmSetting(almSetting, project1, s -> s.setAlmRepo("repo-slug-2")); db.almSettings().insertBitbucketProjectAlmSetting(almSetting, project2, s -> s.setAlmRepo("repo-slug-2")); @@ -133,7 +133,7 @@ public class SearchBitbucketCloudReposActionIT { dto.setPersonalAccessToken("abc:xyz"); dto.setUserUuid(user.getUuid()); }); - ProjectDto projectDto = db.components().insertPrivateProjectDto(); + ProjectDto projectDto = db.components().insertPrivateProject().getProjectDto(); db.almSettings().insertBitbucketCloudProjectAlmSetting(almSetting, projectDto, s -> s.setAlmRepo("repo-slug-2")); SearchBitbucketcloudReposWsResponse response = ws.newRequest() diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/almintegration/ws/bitbucketserver/ImportBitbucketServerProjectActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/almintegration/ws/bitbucketserver/ImportBitbucketServerProjectActionIT.java index 22e9a723883..868050e8cb1 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/almintegration/ws/bitbucketserver/ImportBitbucketServerProjectActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/almintegration/ws/bitbucketserver/ImportBitbucketServerProjectActionIT.java @@ -153,7 +153,7 @@ public class ImportBitbucketServerProjectActionIT { }); Project project = getGsonBBSProject(); Repository repo = getGsonBBSRepo(project); - db.components().insertPublicProject(p -> p.setKey(GENERATED_PROJECT_KEY)); + db.components().insertPublicProject(p -> p.setKey(GENERATED_PROJECT_KEY)).getMainBranchComponent(); assertThatThrownBy(() -> { when(bitbucketServerRestClient.getRepo(any(), any(), any(), any())).thenReturn(repo); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/almintegration/ws/bitbucketserver/SearchBitbucketServerReposActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/almintegration/ws/bitbucketserver/SearchBitbucketServerReposActionIT.java index 319f10edbbc..9dfd9e7de09 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/almintegration/ws/bitbucketserver/SearchBitbucketServerReposActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/almintegration/ws/bitbucketserver/SearchBitbucketServerReposActionIT.java @@ -86,7 +86,7 @@ public class SearchBitbucketServerReposActionIT { dto.setAlmSettingUuid(almSetting.getUuid()); dto.setUserUuid(user.getUuid()); }); - ProjectDto projectDto = db.components().insertPrivateProjectDto(); + ProjectDto projectDto = db.components().insertPrivateProject().getProjectDto(); db.almSettings().insertBitbucketProjectAlmSetting(almSetting, projectDto, s -> s.setAlmRepo("projectKey2"), s -> s.setAlmSlug("repo-slug-2")); AlmIntegrations.SearchBitbucketserverReposWsResponse response = ws.newRequest() @@ -115,7 +115,7 @@ public class SearchBitbucketServerReposActionIT { dto.setAlmSettingUuid(almSetting.getUuid()); dto.setUserUuid(user.getUuid()); }); - ProjectDto projectDto = db.components().insertPrivateProjectDto(); + ProjectDto projectDto = db.components().insertPrivateProject().getProjectDto(); db.almSettings().insertBitbucketProjectAlmSetting(almSetting, projectDto, s -> s.setAlmRepo("projectKey2"), s -> s.setAlmSlug("repo-slug-2")); AlmIntegrations.SearchBitbucketserverReposWsResponse response = ws.newRequest() @@ -135,9 +135,9 @@ public class SearchBitbucketServerReposActionIT { dto.setAlmSettingUuid(almSetting.getUuid()); dto.setUserUuid(user.getUuid()); }); - ProjectDto projectDto = db.components().insertPrivateProjectDto(); + ProjectDto projectDto = db.components().insertPrivateProject().getProjectDto(); db.almSettings().insertBitbucketProjectAlmSetting(almSetting, projectDto, s -> s.setAlmRepo("projectKey2"), s -> s.setAlmSlug("repo-slug-2")); - db.almSettings().insertBitbucketProjectAlmSetting(almSetting, db.components().insertPrivateProjectDto(), s -> s.setAlmRepo("projectKey2"), s -> s.setAlmSlug("repo-slug-2")); + db.almSettings().insertBitbucketProjectAlmSetting(almSetting, db.components().insertPrivateProject().getProjectDto(), s -> s.setAlmRepo("projectKey2"), s -> s.setAlmSlug("repo-slug-2")); AlmIntegrations.SearchBitbucketserverReposWsResponse response = ws.newRequest() .setParam("almSetting", almSetting.getKey()) @@ -161,8 +161,8 @@ public class SearchBitbucketServerReposActionIT { dto.setAlmSettingUuid(almSetting.getUuid()); dto.setUserUuid(user.getUuid()); }); - ProjectDto project1 = db.components().insertPrivateProjectDto(p -> p.setKey("B")); - ProjectDto project2 = db.components().insertPrivateProjectDto(p -> p.setKey("A")); + ProjectDto project1 = db.components().insertPrivateProject(p -> p.setKey("B")).getProjectDto(); + ProjectDto project2 = db.components().insertPrivateProject(p -> p.setKey("A")).getProjectDto(); db.almSettings().insertBitbucketProjectAlmSetting(almSetting, project1, s -> s.setAlmRepo("projectKey2"), s -> s.setAlmSlug("repo-slug-2")); db.almSettings().insertBitbucketProjectAlmSetting(almSetting, project2, s -> s.setAlmRepo("projectKey2"), s -> s.setAlmSlug("repo-slug-2")); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/almintegration/ws/github/ImportGithubProjectActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/almintegration/ws/github/ImportGithubProjectActionIT.java index d54e9e5a06d..5a46c76d782 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/almintegration/ws/github/ImportGithubProjectActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/almintegration/ws/github/ImportGithubProjectActionIT.java @@ -125,7 +125,7 @@ public class ImportGithubProjectActionIT { public void importProject_ifProjectWithSameNameAlreadyExists_importSucceed() { AlmSettingDto githubAlmSetting = setupAlm(); db.almPats().insert(p -> p.setAlmSettingUuid(githubAlmSetting.getUuid()).setUserUuid(userSession.getUuid())); - db.components().insertPublicProject(p -> p.setKey("Hello-World")); + db.components().insertPublicProject(p -> p.setKey("Hello-World")).getMainBranchComponent(); GithubApplicationClient.Repository repository = new GithubApplicationClient.Repository(1L, "Hello-World", false, "Hello-World", "https://github.sonarsource.com/api/v3/repos/octocat/Hello-World", "main"); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/almintegration/ws/github/ListGithubRepositoriesActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/almintegration/ws/github/ListGithubRepositoriesActionIT.java index 2b37cfab657..2b3f0119428 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/almintegration/ws/github/ListGithubRepositoriesActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/almintegration/ws/github/ListGithubRepositoriesActionIT.java @@ -114,10 +114,10 @@ public class ListGithubRepositoriesActionIT { "https://github-enterprise.sonarqube.com/api/v3/github/HelloWorld", "main")) .collect(Collectors.toList()))); - ProjectDto project = db.components().insertPrivateProjectDto(componentDto -> componentDto.setKey("github_HelloWorld")); + ProjectDto project = db.components().insertPrivateProject(componentDto -> componentDto.setKey("github_HelloWorld")).getProjectDto(); db.almSettings().insertGitHubProjectAlmSetting(githubAlmSettings, project, projectAlmSettingDto -> projectAlmSettingDto.setAlmRepo("github/HelloWorld")); - ProjectDto project2 = db.components().insertPrivateProjectDto(componentDto -> componentDto.setKey("github_HelloWorld2")); + ProjectDto project2 = db.components().insertPrivateProject(componentDto -> componentDto.setKey("github_HelloWorld2")).getProjectDto(); db.almSettings().insertGitHubProjectAlmSetting(githubAlmSettings, project2, projectAlmSettingDto -> projectAlmSettingDto.setAlmRepo("github/HelloWorld")); ListGithubRepositoriesWsResponse response = ws.newRequest() diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/almintegration/ws/gitlab/SearchGitlabReposActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/almintegration/ws/gitlab/SearchGitlabReposActionIT.java index ad8b97aac55..95707c614b6 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/almintegration/ws/gitlab/SearchGitlabReposActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/almintegration/ws/gitlab/SearchGitlabReposActionIT.java @@ -81,7 +81,7 @@ public class SearchGitlabReposActionIT { dto.setUserUuid(user.getUuid()); dto.setPersonalAccessToken("some-pat"); }); - ProjectDto projectDto = db.components().insertPrivateProjectDto(); + ProjectDto projectDto = db.components().insertPrivateProject().getProjectDto(); db.almSettings().insertGitlabProjectAlmSetting(almSetting, projectDto); AlmIntegrations.SearchGitlabReposWsResponse response = ws.newRequest() @@ -124,16 +124,16 @@ public class SearchGitlabReposActionIT { dto.setUserUuid(user.getUuid()); dto.setPersonalAccessToken("some-pat"); }); - ProjectDto projectDto1 = db.components().insertPrivateProjectDto(); + ProjectDto projectDto1 = db.components().insertPrivateProject().getProjectDto(); db.almSettings().insertGitlabProjectAlmSetting(almSetting, projectDto1); - ProjectDto projectDto2 = db.components().insertPrivateProjectDto(); + ProjectDto projectDto2 = db.components().insertPrivateProject().getProjectDto(); db.almSettings().insertGitlabProjectAlmSetting(almSetting, projectDto2, projectAlmSettingDto -> projectAlmSettingDto.setAlmRepo("2")); - ProjectDto projectDto3 = db.components().insertPrivateProjectDto(); + ProjectDto projectDto3 = db.components().insertPrivateProject().getProjectDto(); db.almSettings().insertGitlabProjectAlmSetting(almSetting, projectDto3, projectAlmSettingDto -> projectAlmSettingDto.setAlmRepo("3")); - ProjectDto projectDto4 = db.components().insertPrivateProjectDto(); + ProjectDto projectDto4 = db.components().insertPrivateProject().getProjectDto(); db.almSettings().insertGitlabProjectAlmSetting(almSetting, projectDto4, projectAlmSettingDto -> projectAlmSettingDto.setAlmRepo("3")); AlmIntegrations.SearchGitlabReposWsResponse response = ws.newRequest() @@ -168,7 +168,7 @@ public class SearchGitlabReposActionIT { dto.setAlmSettingUuid(almSetting.getUuid()); dto.setUserUuid(user.getUuid()); }); - ProjectDto projectDto = db.components().insertPrivateProjectDto(); + ProjectDto projectDto = db.components().insertPrivateProject().getProjectDto(); db.almSettings().insertGitlabProjectAlmSetting(almSetting, projectDto); AlmIntegrations.SearchGitlabReposWsResponse response = ws.newRequest() @@ -250,7 +250,7 @@ public class SearchGitlabReposActionIT { dto.setUserUuid(user.getUuid()); dto.setPersonalAccessToken("some-pat"); }); - ProjectDto projectDto = db.components().insertPrivateProjectDto(); + ProjectDto projectDto = db.components().insertPrivateProject().getProjectDto(); db.almSettings().insertGitlabProjectAlmSetting(almSetting, projectDto); WebService.Action def = ws.getDef(); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/almsettings/ws/CountBindingActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/almsettings/ws/CountBindingActionIT.java index 201c6b1a796..9ace49429ca 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/almsettings/ws/CountBindingActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/almsettings/ws/CountBindingActionIT.java @@ -56,8 +56,8 @@ public class CountBindingActionIT { UserDto user = db.users().insertUser(); userSession.logIn(user).setSystemAdministrator(); AlmSettingDto almSetting = db.almSettings().insertGitHubAlmSetting(); - ProjectDto project1 = db.components().insertPrivateProjectDto(); - ProjectDto project2 = db.components().insertPrivateProjectDto(); + ProjectDto project1 = db.components().insertPrivateProject().getProjectDto(); + ProjectDto project2 = db.components().insertPrivateProject().getProjectDto(); db.almSettings().insertGitHubProjectAlmSetting(almSetting, project1); db.almSettings().insertGitHubProjectAlmSetting(almSetting, project2); @@ -74,7 +74,7 @@ public class CountBindingActionIT { UserDto user = db.users().insertUser(); userSession.logIn(user).setSystemAdministrator(); AlmSettingDto almSetting = db.almSettings().insertAzureAlmSetting(); - ProjectDto project1 = db.components().insertPrivateProjectDto(); + ProjectDto project1 = db.components().insertPrivateProject().getProjectDto(); db.almSettings().insertAzureProjectAlmSetting(almSetting, project1); CountBindingWsResponse response = ws.newRequest() @@ -118,9 +118,9 @@ public class CountBindingActionIT { .setKey("GitHub Server - Dev Team") .setAppId("12345") .setPrivateKey("54684654")); - db.almSettings().insertGitHubProjectAlmSetting(githubAlmSetting, db.components().insertPrivateProjectDto()); - db.almSettings().insertGitHubProjectAlmSetting(githubAlmSetting, db.components().insertPrivateProjectDto()); - db.almSettings().insertGitHubProjectAlmSetting(githubAlmSetting, db.components().insertPrivateProjectDto()); + db.almSettings().insertGitHubProjectAlmSetting(githubAlmSetting, db.components().insertPrivateProject().getProjectDto()); + db.almSettings().insertGitHubProjectAlmSetting(githubAlmSetting, db.components().insertPrivateProject().getProjectDto()); + db.almSettings().insertGitHubProjectAlmSetting(githubAlmSetting, db.components().insertPrivateProject().getProjectDto()); String response = ws.newRequest() .setParam("almSetting", githubAlmSetting.getKey()) diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/almsettings/ws/DeleteActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/almsettings/ws/DeleteActionIT.java index a0e896f6681..3b25ca67c63 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/almsettings/ws/DeleteActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/almsettings/ws/DeleteActionIT.java @@ -83,11 +83,11 @@ public class DeleteActionIT { UserDto user = db.users().insertUser(); userSession.logIn(user).setSystemAdministrator(); AlmSettingDto almSetting = db.almSettings().insertGitHubAlmSetting(); - ProjectDto project = db.components().insertPrivateProjectDto(); + ProjectDto project = db.components().insertPrivateProject().getProjectDto(); db.almSettings().insertGitHubProjectAlmSetting(almSetting, project); // Second setting having a project bound on it, should not be impacted by the deletion of the first one AlmSettingDto anotherAlmSetting2 = db.almSettings().insertGitHubAlmSetting(); - ProjectDto anotherProject = db.components().insertPrivateProjectDto(); + ProjectDto anotherProject = db.components().insertPrivateProject().getProjectDto(); db.almSettings().insertGitHubProjectAlmSetting(anotherAlmSetting2, anotherProject); ws.newRequest() diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/almsettings/ws/GetBindingActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/almsettings/ws/GetBindingActionIT.java index beb7bdf66f6..df702438dca 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/almsettings/ws/GetBindingActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/almsettings/ws/GetBindingActionIT.java @@ -57,7 +57,7 @@ public class GetBindingActionIT { @Before public void before() { user = db.users().insertUser(); - project = db.components().insertPrivateProjectDto(); + project = db.components().insertPrivateProject().getProjectDto(); } @Test @@ -99,7 +99,7 @@ public class GetBindingActionIT { @Test public void get_gitlab_project_binding() { UserDto user = db.users().insertUser(); - ProjectDto project = db.components().insertPrivateProjectDto(); + ProjectDto project = db.components().insertPrivateProject().getProjectDto(); userSession.logIn(user).addProjectPermission(USER, project); AlmSettingDto almSetting = db.almSettings().insertGitlabAlmSetting(); db.almSettings().insertGitlabProjectAlmSetting(almSetting, project); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/almsettings/ws/ListActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/almsettings/ws/ListActionIT.java index df67e0baefe..4b5c1e6f244 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/almsettings/ws/ListActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/almsettings/ws/ListActionIT.java @@ -88,7 +88,7 @@ public class ListActionIT { @Test public void list_is_ordered_by_alm_key() { UserDto user = db.users().insertUser(); - db.components().insertPrivateProject(); + db.components().insertPrivateProject().getMainBranchComponent(); userSession.logIn(user).addPermission(PROVISION_PROJECTS); db.almSettings().insertGitHubAlmSetting(almSetting -> almSetting.setKey("GitHub1")); db.almSettings().insertGitHubAlmSetting(almSetting -> almSetting.setKey("GitHub2")); @@ -112,7 +112,7 @@ public class ListActionIT { @Test public void fail_when_project_does_not_exist() { UserDto user = db.users().insertUser(); - ProjectDto project = db.components().insertPrivateProjectDto(); + ProjectDto project = db.components().insertPrivateProject().getProjectDto(); userSession.logIn(user).addProjectPermission(ADMIN, project); AlmSettingDto githubAlmSetting = db.almSettings().insertGitHubAlmSetting(); db.almSettings().insertGitHubProjectAlmSetting(githubAlmSetting, project); @@ -126,7 +126,7 @@ public class ListActionIT { @Test public void fail_when_missing_administer_permission_on_private_project() { UserDto user = db.users().insertUser(); - ProjectDto project = db.components().insertPrivateProjectDto(); + ProjectDto project = db.components().insertPrivateProject().getProjectDto(); userSession.logIn(user).addProjectPermission(USER, project); AlmSettingDto githubAlmSetting = db.almSettings().insertGitHubAlmSetting(); db.almSettings().insertGitHubProjectAlmSetting(githubAlmSetting, project); @@ -140,7 +140,7 @@ public class ListActionIT { @Test public void fail_when_missing_administer_permission_on_public_project() { UserDto user = db.users().insertUser(); - ProjectDto project = db.components().insertPublicProjectDto(); + ProjectDto project = db.components().insertPublicProject().getProjectDto(); userSession.logIn(user).addProjectPermission(SCAN, project); AlmSettingDto githubAlmSetting = db.almSettings().insertGitHubAlmSetting(); db.almSettings().insertGitHubProjectAlmSetting(githubAlmSetting, project); @@ -165,7 +165,7 @@ public class ListActionIT { @Test public void json_example_with_administer_permission() { UserDto user = db.users().insertUser(); - ProjectDto project = db.components().insertPrivateProjectDto(); + ProjectDto project = db.components().insertPrivateProject().getProjectDto(); userSession.logIn(user).addProjectPermission(ADMIN, project); initAlmSetting(); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/badge/ws/MeasureActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/badge/ws/MeasureActionIT.java index 7f22735cdd9..d9c38fba6aa 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/badge/ws/MeasureActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/badge/ws/MeasureActionIT.java @@ -101,7 +101,7 @@ public class MeasureActionIT { @Test public void int_measure() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); userSession.registerComponents(project); MetricDto metric = createIntMetricAndMeasure(project, BUGS_KEY, 10_000); @@ -118,7 +118,7 @@ public class MeasureActionIT { @Test public void percent_measure() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); userSession.registerComponents(project); MetricDto metric = db.measures().insertMetric(m -> m.setKey(COVERAGE_KEY).setValueType(PERCENT.name())); db.measures().insertLiveMeasure(project, metric, m -> m.setValue(12.345d)); @@ -136,7 +136,7 @@ public class MeasureActionIT { @Test public void duration_measure() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); userSession.registerComponents(project); MetricDto metric = db.measures().insertMetric(m -> m.setKey(TECHNICAL_DEBT_KEY).setValueType(WORK_DUR.name())); db.measures().insertLiveMeasure(project, metric, m -> m.setValue(10_000d)); @@ -166,7 +166,7 @@ public class MeasureActionIT { @Test @UseDataProvider("ratings") public void rating_measure(Rating rating, Color color) { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); userSession.registerComponents(project); MetricDto metric = db.measures().insertMetric(m -> m.setKey(SQALE_RATING_KEY).setValueType(RATING.name())); db.measures().insertLiveMeasure(project, metric, m -> m.setValue((double) rating.getIndex()).setData(rating.name())); @@ -193,7 +193,7 @@ public class MeasureActionIT { @Test @UseDataProvider("qualityGates") public void quality_gate(Level status, String expectedValue, Color expectedColor) { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); userSession.registerComponents(project); MetricDto metric = createQualityGateMetric(); db.measures().insertLiveMeasure(project, metric, m -> m.setData(status.name())); @@ -211,7 +211,7 @@ public class MeasureActionIT { @Test public void security_hotspots() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); userSession.registerComponents(project); MetricDto metric = createIntMetricAndMeasure(project, SECURITY_HOTSPOTS_KEY, 42); @@ -229,7 +229,7 @@ public class MeasureActionIT { @Test public void display_deprecated_warning_quality_gate() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); userSession.registerComponents(project); MetricDto metric = createQualityGateMetric(); db.measures().insertLiveMeasure(project, metric, m -> m.setData(WARN.name())); @@ -244,7 +244,7 @@ public class MeasureActionIT { @Test public void measure_on_non_main_branch() { - ComponentDto project = db.components().insertPublicProject(p -> p.setPrivate(false)); + ComponentDto project = db.components().insertPublicProject(p -> p.setPrivate(false)).getMainBranchComponent(); userSession.registerComponents(project); MetricDto metric = createIntMetricAndMeasure(project, BUGS_KEY, 5_000); String branchName = randomAlphanumeric(248); @@ -273,7 +273,7 @@ public class MeasureActionIT { @Test public void measure_on_application() { - ComponentDto application = db.components().insertPublicApplication(); + ComponentDto application = db.components().insertPublicApplication().getMainBranchComponent(); userSession.registerComponents(application); MetricDto metric = createIntMetricAndMeasure(application, BUGS_KEY, 10_000); @@ -302,7 +302,7 @@ public class MeasureActionIT { @Test public void return_error_if_branch_does_not_exist() throws ParseException { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto branch = db.components().insertProjectBranch(project, b -> b.setBranchType(BranchType.BRANCH)); userSession.registerComponents(project); MetricDto metric = db.measures().insertMetric(m -> m.setKey(BUGS_KEY)); @@ -318,7 +318,7 @@ public class MeasureActionIT { @Test public void return_error_if_measure_not_found() throws ParseException { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); userSession.registerComponents(project); MetricDto metric = db.measures().insertMetric(m -> m.setKey(BUGS_KEY)); @@ -332,7 +332,7 @@ public class MeasureActionIT { @Test public void return_error_on_directory() throws ParseException { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto directory = db.components().insertComponent(ComponentTesting.newDirectory(project, "path")); userSession.registerComponents(project); MetricDto metric = db.measures().insertMetric(m -> m.setKey(BUGS_KEY).setValueType(INT.name())); @@ -347,7 +347,7 @@ public class MeasureActionIT { @Test public void return_error_on_private_project_without_token() throws ParseException { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); UserDto user = db.users().insertUser(); userSession.logIn(user).addProjectPermission(USER, project); MetricDto metric = db.measures().insertMetric(m -> m.setKey(BUGS_KEY).setValueType(INT.name())); @@ -383,7 +383,7 @@ public class MeasureActionIT { @UseDataProvider("publicProject_forceAuth_accessGranted") public void badge_accessible_on_private_project_with_token(boolean publicProject, boolean forceAuth, boolean validToken, boolean accessGranted) throws ParseException { - ComponentDto projectAsComponent = publicProject ? db.components().insertPublicProject() : db.components().insertPrivateProject(); + ComponentDto projectAsComponent = publicProject ? db.components().insertPublicProject().getMainBranchComponent() : db.components().insertPrivateProject().getMainBranchComponent(); userSession.registerComponents(projectAsComponent); MetricDto metric = createIntMetricAndMeasure(projectAsComponent, BUGS_KEY, 10_000); @@ -412,7 +412,7 @@ public class MeasureActionIT { @Test public void return_error_on_provisioned_project() throws ParseException { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); userSession.registerComponents(project); MetricDto metric = db.measures().insertMetric(m -> m.setKey(BUGS_KEY).setValueType(INT.name())); @@ -426,7 +426,7 @@ public class MeasureActionIT { @Test public void fail_on_invalid_quality_gate() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); userSession.registerComponents(project); MetricDto metric = createQualityGateMetric(); db.measures().insertLiveMeasure(project, metric, m -> m.setData("UNKNOWN")); @@ -444,7 +444,7 @@ public class MeasureActionIT { @Test public void fail_when_measure_value_is_null() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); userSession.registerComponents(project); MetricDto metric = db.measures().insertMetric(m -> m.setKey(BUGS_KEY).setValueType(INT.name())); db.measures().insertLiveMeasure(project, metric, m -> m.setValue(null)); @@ -463,7 +463,7 @@ public class MeasureActionIT { @Test public void fail_when_metric_not_found() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); userSession.registerComponents(project); TestRequest request = ws.newRequest() diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/badge/ws/QualityGateActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/badge/ws/QualityGateActionIT.java index 1ab42e9a154..c76bb9b483a 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/badge/ws/QualityGateActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/badge/ws/QualityGateActionIT.java @@ -85,7 +85,7 @@ public class QualityGateActionIT { @Test public void quality_gate_passed() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); userSession.registerComponents(project); MetricDto metric = createQualityGateMetric(); db.measures().insertLiveMeasure(project, metric, m -> m.setData(OK.name())); @@ -99,7 +99,7 @@ public class QualityGateActionIT { @Test public void quality_gate_failed() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); userSession.registerComponents(project); MetricDto metric = createQualityGateMetric(); db.measures().insertLiveMeasure(project, metric, m -> m.setData(ERROR.name())); @@ -135,7 +135,7 @@ public class QualityGateActionIT { @UseDataProvider("publicProject_forceAuth_validToken_accessGranted") public void badge_accessible_on_private_project_with_token(boolean publicProject, boolean forceAuth, boolean validToken, boolean accessGranted) throws ParseException { - ComponentDto projectAsComponent = publicProject ? db.components().insertPublicProject() : db.components().insertPrivateProject(); + ComponentDto projectAsComponent = publicProject ? db.components().insertPublicProject().getMainBranchComponent() : db.components().insertPrivateProject().getMainBranchComponent(); userSession.registerComponents(projectAsComponent); MetricDto metric = createQualityGateMetric(); @@ -165,7 +165,7 @@ public class QualityGateActionIT { @Test public void etag_should_be_different_if_quality_gate_is_different() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); userSession.registerComponents(project); MetricDto metric = createQualityGateMetric(); LiveMeasureDto liveMeasure = db.measures().insertLiveMeasure(project, metric, m -> m.setData(OK.name())); @@ -192,7 +192,7 @@ public class QualityGateActionIT { @Test public void when_IfNoneMatch_match_etag_http_304_must_be_send() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); userSession.registerComponents(project); MetricDto metric = createQualityGateMetric(); db.measures().insertLiveMeasure(project, metric, m -> m.setData(OK.name())); @@ -213,7 +213,7 @@ public class QualityGateActionIT { @Test public void quality_gate_on_branch() { - ComponentDto project = db.components().insertPublicProject(p -> p.setPrivate(false)); + ComponentDto project = db.components().insertPublicProject(p -> p.setPrivate(false)).getMainBranchComponent(); userSession.registerComponents(project); MetricDto metric = createQualityGateMetric(); db.measures().insertLiveMeasure(project, metric, m -> m.setData(OK.name())); @@ -231,7 +231,7 @@ public class QualityGateActionIT { @Test public void quality_gate_on_application() { - ComponentDto application = db.components().insertPublicApplication(); + ComponentDto application = db.components().insertPublicApplication().getMainBranchComponent(); userSession.registerComponents(application); MetricDto metric = createQualityGateMetric(); db.measures().insertLiveMeasure(application, metric, m -> m.setData(ERROR.name())); @@ -245,7 +245,7 @@ public class QualityGateActionIT { @Test public void return_error_on_directory() throws ParseException { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto directory = db.components().insertComponent(ComponentTesting.newDirectory(project, "path")); userSession.registerComponents(project); @@ -258,7 +258,7 @@ public class QualityGateActionIT { @Test public void return_error_on_private_project() throws ParseException { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); UserDto user = db.users().insertUser(); userSession.logIn(user).addProjectPermission(USER, project); @@ -271,7 +271,7 @@ public class QualityGateActionIT { @Test public void return_error_on_provisioned_project() throws ParseException { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); userSession.registerComponents(project); TestResponse response = ws.newRequest() @@ -292,7 +292,7 @@ public class QualityGateActionIT { @Test public void return_error_on_not_existing_branch() throws ParseException { - ComponentDto project = db.components().insertPublicProject(p -> p.setPrivate(false)); + ComponentDto project = db.components().insertPublicProject(p -> p.setPrivate(false)).getMainBranchComponent(); userSession.registerComponents(project); ComponentDto branch = db.components().insertProjectBranch(project, b -> b.setBranchType(BRANCH)); @@ -306,7 +306,7 @@ public class QualityGateActionIT { @Test public void return_error_if_measure_not_found() throws ParseException { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); userSession.registerComponents(project); TestResponse response = ws.newRequest() @@ -318,7 +318,7 @@ public class QualityGateActionIT { @Test public void return_error_if_measure_value_is_null() throws ParseException { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); userSession.registerComponents(project); MetricDto metric = createQualityGateMetric(); db.measures().insertLiveMeasure(project, metric, m -> m.setValue(null).setData((String) null)); @@ -333,7 +333,7 @@ public class QualityGateActionIT { @Test public void fail_on_invalid_quality_gate() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); userSession.registerComponents(project); MetricDto metric = createQualityGateMetric(); db.measures().insertLiveMeasure(project, metric, m -> m.setData("UNKNOWN")); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/badge/ws/TokenActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/badge/ws/TokenActionIT.java index c64be1200d6..833427efe96 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/badge/ws/TokenActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/badge/ws/TokenActionIT.java @@ -61,7 +61,7 @@ public class TokenActionIT { @Test public void missing_project_permission_should_fail() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); TestRequest request = ws.newRequest().setParam("project", project.getKey()); @@ -72,7 +72,7 @@ public class TokenActionIT { @Test public void should_generate_token() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.logIn().addProjectPermission(UserRole.USER, project); when(tokenGenerator.generate(TokenType.PROJECT_BADGE_TOKEN)).thenReturn("generated_token"); @@ -83,7 +83,7 @@ public class TokenActionIT { @Test public void handle_whenApplicationKeyPassed_shouldReturnToken() { - ComponentDto application = db.components().insertPrivateApplication(); + ComponentDto application = db.components().insertPrivateApplication().getMainBranchComponent(); userSession.logIn().addProjectPermission(UserRole.USER, application); when(tokenGenerator.generate(TokenType.PROJECT_BADGE_TOKEN)).thenReturn("generated_token"); @@ -95,7 +95,7 @@ public class TokenActionIT { @Test public void should_reuse_generated_token() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.logIn().addProjectPermission(UserRole.USER, project); when(tokenGenerator.generate(TokenType.PROJECT_BADGE_TOKEN)).thenReturn("generated_token"); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/badge/ws/TokenRenewActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/badge/ws/TokenRenewActionIT.java index 09e5d9c0780..8fdba0eee96 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/badge/ws/TokenRenewActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/badge/ws/TokenRenewActionIT.java @@ -74,7 +74,7 @@ public class TokenRenewActionIT { @Test public void missing_project_admin_permission_should_fail() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); TestRequest request = ws.newRequest().setParam("project", project.getKey()); @@ -85,7 +85,7 @@ public class TokenRenewActionIT { @Test public void should_add_token_when_no_token_yet_and_return_204() { - ProjectDto project = db.components().insertPrivateProjectDto(); + ProjectDto project = db.components().insertPrivateProject().getProjectDto(); userSession.logIn().addProjectPermission(UserRole.ADMIN, project); when(tokenGenerator.generate(TokenType.PROJECT_BADGE_TOKEN)).thenReturn("generated_token"); @@ -99,7 +99,7 @@ public class TokenRenewActionIT { @Test public void handle_whenApplicationKeyPassed_shouldAddTokenAndReturn204() { - ProjectDto application = db.components().insertPrivateApplicationDto(); + ProjectDto application = db.components().insertPrivateApplication().getProjectDto(); userSession.logIn().addProjectPermission(UserRole.ADMIN, application); when(tokenGenerator.generate(TokenType.PROJECT_BADGE_TOKEN)).thenReturn("generated_token"); @@ -113,7 +113,7 @@ public class TokenRenewActionIT { @Test public void should_replace_existing_token_when__token_already_present_and_update_update_at() { - ProjectDto project = db.components().insertPrivateProjectDto(); + ProjectDto project = db.components().insertPrivateProject().getProjectDto(); userSession.logIn().addProjectPermission(UserRole.ADMIN, project); when(tokenGenerator.generate(TokenType.PROJECT_BADGE_TOKEN)).thenReturn("generated_token"); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/batch/ProjectDataLoaderIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/batch/ProjectDataLoaderIT.java index 85aac489978..c0d47cd8749 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/batch/ProjectDataLoaderIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/batch/ProjectDataLoaderIT.java @@ -33,7 +33,6 @@ import org.sonar.db.source.FileSourceDto; import org.sonar.scanner.protocol.input.FileData; import org.sonar.scanner.protocol.input.ProjectRepositories; import org.sonar.server.component.ComponentFinder; -import org.sonar.server.exceptions.BadRequestException; import org.sonar.server.exceptions.ForbiddenException; import org.sonar.server.exceptions.NotFoundException; import org.sonar.server.tester.UserSessionRule; @@ -58,7 +57,7 @@ public class ProjectDataLoaderIT { @Test public void throws_NotFoundException_when_branch_does_not_exist() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.logIn().addProjectPermission(SCAN.getKey(), project); assertThatThrownBy(() -> { @@ -72,7 +71,7 @@ public class ProjectDataLoaderIT { @Test public void return_file_data_from_single_project() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.logIn().addProjectPermission(SCAN.getKey(), project); ComponentDto file = db.components().insertComponent(newFileDto(project)); dbClient.fileSourceDao().insert(dbSession, newFileSourceDto(file).setSrcHash("123456")); @@ -87,7 +86,7 @@ public class ProjectDataLoaderIT { @Test public void return_file_data_from_branch() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto branch = db.components().insertProjectBranch(project, b -> b.setKey("my_branch")); userSession.logIn().addProjectPermission(SCAN.getKey(), project); // File on branch @@ -144,7 +143,7 @@ public class ProjectDataLoaderIT { @Test public void throw_ForbiddenException_if_no_scan_permission_on_sonarqube() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.logIn(); assertThatThrownBy(() -> underTest.load(ProjectDataQuery.create().setProjectKey(project.getKey()))) diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/branch/ws/DeleteActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/branch/ws/DeleteActionIT.java index 40d763dda92..7f1e99a2d51 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/branch/ws/DeleteActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/branch/ws/DeleteActionIT.java @@ -62,7 +62,7 @@ public class DeleteActionIT { @Test public void delete_branch() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto branch = db.components().insertProjectBranch(project, b -> b.setKey("branch1")); userSession.logIn().addProjectPermission(UserRole.ADMIN, project); @@ -102,7 +102,7 @@ public class DeleteActionIT { @Test public void fail_if_branch_does_not_exist() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.logIn().addProjectPermission(UserRole.ADMIN, project); assertThatThrownBy(() -> tester.newRequest() @@ -127,7 +127,7 @@ public class DeleteActionIT { @Test public void fail_if_branch_is_main() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); db.executeUpdateSql("UPDATE project_branches set KEE = 'main'"); userSession.logIn().addProjectPermission(UserRole.ADMIN, project); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/branch/ws/ListActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/branch/ws/ListActionIT.java index c6c7c4b4517..d33740f6351 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/branch/ws/ListActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/branch/ws/ListActionIT.java @@ -97,7 +97,7 @@ public class ListActionIT { @Test public void test_example() { - ComponentDto project = db.components().insertPrivateProject(p -> p.setKey("sonarqube")); + ComponentDto project = db.components().insertPrivateProject(p -> p.setKey("sonarqube")).getMainBranchComponent(); db.getDbClient().snapshotDao().insert(db.getSession(), newAnalysis(project).setLast(true).setCreatedAt(parseDateTime("2017-04-01T01:15:42+0100").getTime())); db.measures().insertLiveMeasure(project, qualityGateStatus, m -> m.setData("ERROR")); @@ -126,7 +126,7 @@ public class ListActionIT { @Test public void test_with_SCAN_EXCUTION_permission() { - ComponentDto project = db.components().insertPrivateProject(p -> p.setKey("sonarqube")); + ComponentDto project = db.components().insertPrivateProject(p -> p.setKey("sonarqube")).getMainBranchComponent(); db.getDbClient().snapshotDao().insert(db.getSession(), newAnalysis(project).setLast(true).setCreatedAt(parseDateTime("2017-04-01T01:15:42+0100").getTime())); db.measures().insertLiveMeasure(project, qualityGateStatus, m -> m.setData("ERROR")); @@ -153,7 +153,7 @@ public class ListActionIT { @Test public void main_branch() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.logIn().addProjectPermission(USER, project); ListWsResponse response = ws.newRequest() @@ -167,7 +167,7 @@ public class ListActionIT { @Test public void main_branch_with_specified_name() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); db.getDbClient().branchDao().updateBranchName(db.getSession(), project.uuid(), "head"); db.commit(); userSession.logIn().addProjectPermission(USER, project); @@ -183,7 +183,7 @@ public class ListActionIT { @Test public void test_project_with_branches() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); db.components().insertProjectBranch(project, b -> b.setKey("feature/bar")); db.components().insertProjectBranch(project, b -> b.setKey("feature/foo")); userSession.logIn().addProjectPermission(USER, project); @@ -202,7 +202,7 @@ public class ListActionIT { @Test public void status_on_branch() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.logIn().addProjectPermission(USER, project); ComponentDto branch = db.components().insertProjectBranch(project, b -> b.setBranchType(org.sonar.db.component.BranchType.BRANCH)); db.measures().insertLiveMeasure(branch, qualityGateStatus, m -> m.setData("OK")); @@ -220,7 +220,7 @@ public class ListActionIT { public void response_contains_date_of_last_analysis() { Long lastAnalysisBranch = dateToLong(parseDateTime("2017-04-01T00:00:00+0100")); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.logIn().addProjectPermission(USER, project); ComponentDto branch2 = db.components().insertProjectBranch(project, b -> b.setBranchType(org.sonar.db.component.BranchType.BRANCH)); db.getDbClient().snapshotDao().insert(db.getSession(), @@ -247,7 +247,7 @@ public class ListActionIT { @Test public void application_branches() { - ComponentDto application = db.components().insertPrivateApplication(); + ComponentDto application = db.components().insertPrivateApplication().getMainBranchComponent(); db.components().insertProjectBranch(application, b -> b.setKey("feature/bar")); db.components().insertProjectBranch(application, b -> b.setKey("feature/foo")); userSession.logIn().addProjectPermission(USER, application); @@ -273,7 +273,7 @@ public class ListActionIT { @Test public void fail_if_not_a_reference_on_project() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(ComponentTesting.newFileDto(project)); userSession.logIn().addProjectPermission(USER, project); TestRequest request = ws.newRequest().setParam("project", file.getKey()); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/branch/ws/RenameActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/branch/ws/RenameActionIT.java index 03d43e33c4a..51dcbd6b2e7 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/branch/ws/RenameActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/branch/ws/RenameActionIT.java @@ -89,7 +89,7 @@ public class RenameActionIT { @Test public void fail_if_no_administer_permission() { userSession.logIn(); - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); assertThatThrownBy(() -> tester.newRequest() .setParam("project", project.getKey()) @@ -102,7 +102,7 @@ public class RenameActionIT { @Test public void rename() { userSession.logIn(); - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto branch = db.components().insertProjectBranch(project, b -> b.setKey("branch")); userSession.addProjectPermission(UserRole.ADMIN, project); @@ -122,7 +122,7 @@ public class RenameActionIT { @Test public void rename_with_same_name() { userSession.logIn(); - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto branch = db.components().insertProjectBranch(project, b -> b.setKey("branch")); userSession.addProjectPermission(UserRole.ADMIN, project); @@ -147,7 +147,7 @@ public class RenameActionIT { @Test public void fail_if_name_already_used() { userSession.logIn(); - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); userSession.addProjectPermission(UserRole.ADMIN, project); db.components().insertProjectBranch(project, b -> b.setKey("branch")); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/branch/ws/SetAutomaticDeletionProtectionActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/branch/ws/SetAutomaticDeletionProtectionActionIT.java index 71453cb7f88..d2d7fecf1cd 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/branch/ws/SetAutomaticDeletionProtectionActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/branch/ws/SetAutomaticDeletionProtectionActionIT.java @@ -105,7 +105,7 @@ public class SetAutomaticDeletionProtectionActionIT { @Test public void fail_if_no_administer_permission() { userSession.logIn(); - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); assertThatThrownBy(() -> tester.newRequest() .setParam("project", project.getKey()) @@ -119,7 +119,7 @@ public class SetAutomaticDeletionProtectionActionIT { @Test public void fail_when_attempting_to_set_main_branch_as_included_in_purge() { userSession.logIn(); - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto branch = db.components().insertProjectBranch(project, b -> b.setKey("branch1").setExcludeFromPurge(false)); userSession.addProjectPermission(UserRole.ADMIN, project); @@ -135,7 +135,7 @@ public class SetAutomaticDeletionProtectionActionIT { @Test public void set_purge_exclusion() { userSession.logIn(); - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto branch = db.components().insertProjectBranch(project, b -> b.setKey("branch1").setExcludeFromPurge(false)); userSession.addProjectPermission(UserRole.ADMIN, project); @@ -158,7 +158,7 @@ public class SetAutomaticDeletionProtectionActionIT { @Test public void fail_on_non_boolean_value_parameter() { userSession.logIn(); - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); assertThatThrownBy(() -> tester.newRequest() .setParam("project", project.getKey()) @@ -185,7 +185,7 @@ public class SetAutomaticDeletionProtectionActionIT { @Test public void fail_if_branch_does_not_exist() { userSession.logIn(); - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); userSession.addProjectPermission(UserRole.ADMIN, project); assertThatThrownBy(() -> tester.newRequest() diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/ce/projectdump/ExportSubmitterImplIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/ce/projectdump/ExportSubmitterImplIT.java index f631ecc0116..1fca898ea2d 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/ce/projectdump/ExportSubmitterImplIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/ce/projectdump/ExportSubmitterImplIT.java @@ -65,7 +65,7 @@ public class ExportSubmitterImplIT { @Test public void submitProjectExport_submits_task_with_project_uuid_and_submitterLogin_if_present() { - ComponentDto projectDto = db.components().insertPrivateProject(); + ComponentDto projectDto = db.components().insertPrivateProject().getMainBranchComponent(); underTest.submitProjectExport(projectDto.getKey(), SOME_SUBMITTER_UUID); @@ -76,7 +76,7 @@ public class ExportSubmitterImplIT { @Test public void submitProjectExport_submits_task_with_project_uuid_and_no_submitterLogin_if_null() { - ComponentDto projectDto = db.components().insertPrivateProject(); + ComponentDto projectDto = db.components().insertPrivateProject().getMainBranchComponent(); underTest.submitProjectExport(projectDto.getKey(), null); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/ce/queue/BranchReportSubmitterIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/ce/queue/BranchReportSubmitterIT.java index a4f53fa173e..fab729ff554 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/ce/queue/BranchReportSubmitterIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/ce/queue/BranchReportSubmitterIT.java @@ -105,7 +105,7 @@ public class BranchReportSubmitterIT { @Test public void submit_does_not_use_delegate_if_characteristics_are_empty() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); UserDto user = db.users().insertUser(); userSession.logIn(user).addProjectPermission(SCAN.getKey(), project); mockSuccessfulPrepareSubmitCall(); @@ -118,7 +118,7 @@ public class BranchReportSubmitterIT { @Test public void submit_a_report_on_existing_branch() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto branch = db.components().insertProjectBranch(project, b -> b.setKey("branch1")); UserDto user = db.users().insertUser(); userSession.logIn(user).addProjectPermission(SCAN.getKey(), project).addProjectBranchMapping(project.uuid(), branch); @@ -141,7 +141,7 @@ public class BranchReportSubmitterIT { @Test public void submit_a_report_on_missing_branch_but_existing_project() { - ComponentDto existingProject = db.components().insertPublicProject(); + ComponentDto existingProject = db.components().insertPublicProject().getMainBranchComponent(); BranchDto exitingProjectMainBranch = db.getDbClient().branchDao().selectByUuid(db.getSession(), existingProject.uuid()).get(); UserDto user = db.users().insertUser(); userSession.logIn(user).addProjectPermission(SCAN.getKey(), existingProject); @@ -179,7 +179,7 @@ public class BranchReportSubmitterIT { BranchSupport.ComponentKey componentKey = createComponentKeyOfBranch(nonExistingProject.getKey()); when(branchSupportDelegate.createComponentKey(nonExistingProject.getKey(), randomCharacteristics)).thenReturn(componentKey); when(componentUpdater.createWithoutCommit(any(), any(), eq(user.getUuid()), eq(user.getLogin()), any())) - .thenAnswer((Answer) invocation -> db.components().insertPrivateProject(nonExistingProject)); + .thenAnswer((Answer) invocation -> db.components().insertPrivateProject(nonExistingProject).getMainBranchComponent()); when(branchSupportDelegate.createBranchComponent(any(DbSession.class), same(componentKey), eq(nonExistingProject), any())).thenReturn(createdBranch); when(permissionTemplateService.wouldUserHaveScanPermissionWithDefaultTemplate(any(DbSession.class), any(), eq(nonExistingProject.getKey()))).thenReturn(true); String taskUuid = mockSuccessfulPrepareSubmitCall(); @@ -198,7 +198,7 @@ public class BranchReportSubmitterIT { @Test public void submit_fails_if_branch_support_delegate_createComponentKey_throws_an_exception() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); UserDto user = db.users().insertUser(); userSession.logIn(user).addProjectPermission(SCAN.getKey(), project); Map randomCharacteristics = randomNonEmptyMap(); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/ce/queue/ReportSubmitterIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/ce/queue/ReportSubmitterIT.java index 38b8661b29f..76934db35ca 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/ce/queue/ReportSubmitterIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/ce/queue/ReportSubmitterIT.java @@ -137,7 +137,7 @@ public class ReportSubmitterIT { @Test public void submit_a_report_on_existing_project() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); UserDto user = db.users().insertUser(); userSession.logIn(user).addProjectPermission(SCAN.getKey(), project); mockSuccessfulPrepareSubmitCall(); @@ -206,7 +206,7 @@ public class ReportSubmitterIT { @Test public void do_no_add_favorite_when_already_100_favorite_projects_and_no_project_creator_permission_on_permission_template() { UserDto user = db.users().insertUser(); - rangeClosed(1, 100).forEach(i -> db.favorites().add(db.components().insertPrivateProject(), user.getUuid(), user.getLogin())); + rangeClosed(1, 100).forEach(i -> db.favorites().add(db.components().insertPrivateProject().getMainBranchComponent(), user.getUuid(), user.getLogin())); userSession .logIn(user) .addPermission(GlobalPermission.SCAN) @@ -237,7 +237,7 @@ public class ReportSubmitterIT { @Test public void user_with_scan_permission_is_allowed_to_submit_a_report_on_existing_project() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addPermission(SCAN); mockSuccessfulPrepareSubmitCall(); @@ -248,7 +248,7 @@ public class ReportSubmitterIT { @Test public void submit_a_report_on_existing_project_with_project_scan_permission() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(SCAN.getKey(), project); mockSuccessfulPrepareSubmitCall(); @@ -274,7 +274,7 @@ public class ReportSubmitterIT { @Test public void fail_if_project_key_already_exists_as_other_component() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto dir = db.components().insertComponent(newDirectory(project, "path")); userSession.logIn().addProjectPermission(SCAN.getKey(), project); mockSuccessfulPrepareSubmitCall(); @@ -302,7 +302,7 @@ public class ReportSubmitterIT { @Test public void fail_with_forbidden_exception_on_new_project_when_only_project_scan_permission() { - ComponentDto component = db.components().insertPrivateProject(PROJECT_UUID); + ComponentDto component = db.components().insertPrivateProject(PROJECT_UUID).getMainBranchComponent(); userSession.addProjectPermission(SCAN.getKey(), component); mockSuccessfulPrepareSubmitCall(); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/ce/ws/ActivityActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/ce/ws/ActivityActionIT.java index d88faef09c0..893f5ede974 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/ce/ws/ActivityActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/ce/ws/ActivityActionIT.java @@ -97,8 +97,8 @@ public class ActivityActionIT { @Test public void get_all_past_activity() { logInAsSystemAdministrator(); - ComponentDto project1 = db.components().insertPrivateProject(); - ComponentDto project2 = db.components().insertPrivateProject(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); SnapshotDto analysisProject1 = db.components().insertSnapshot(project1); insertActivity("T1", project1, SUCCESS, analysisProject1); insertActivity("T2", project2, FAILED, null); @@ -128,8 +128,8 @@ public class ActivityActionIT { @Test public void filter_by_status() { logInAsSystemAdministrator(); - ComponentDto project1 = db.components().insertPrivateProject(); - ComponentDto project2 = db.components().insertPrivateProject(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); insertActivity("T1", project1, SUCCESS); insertActivity("T2", project2, FAILED); insertQueue("T3", project1, IN_PROGRESS); @@ -145,8 +145,8 @@ public class ActivityActionIT { @Test public void filter_by_max_executed_at_exclude() { logInAsSystemAdministrator(); - ComponentDto project1 = db.components().insertPrivateProject(); - ComponentDto project2 = db.components().insertPrivateProject(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); insertActivity("T1", project1, SUCCESS); insertActivity("T2", project2, FAILED); insertQueue("T3", project1, IN_PROGRESS); @@ -161,7 +161,7 @@ public class ActivityActionIT { @Test public void filter_by_min_submitted_and_max_executed_at_include_day() { logInAsSystemAdministrator(); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); insertActivity("T1", project, SUCCESS); String today = formatDate(new Date(EXECUTED_AT)); @@ -175,7 +175,7 @@ public class ActivityActionIT { @Test public void filter_on_current_activities() { logInAsSystemAdministrator(); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); // T2 is the current activity (the most recent one) insertActivity("T1", project, SUCCESS); insertActivity("T2", project, FAILED); @@ -203,8 +203,8 @@ public class ActivityActionIT { @Test public void limit_results() { logInAsSystemAdministrator(); - ComponentDto project1 = db.components().insertPrivateProject(); - ComponentDto project2 = db.components().insertPrivateProject(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); insertActivity("T1", project1, SUCCESS); insertActivity("T2", project2, FAILED); insertQueue("T3", project1, IN_PROGRESS); @@ -225,7 +225,7 @@ public class ActivityActionIT { @Test public void remove_queued_already_completed() { logInAsSystemAdministrator(); - ComponentDto project1 = db.components().insertPrivateProject(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); insertActivity("T1", project1, SUCCESS); insertQueue("T1", project1, IN_PROGRESS); @@ -243,8 +243,8 @@ public class ActivityActionIT { @Test public void return_warnings_count_on_queue_and_activity_but_no_warnings_list() { logInAsSystemAdministrator(); - ComponentDto project1 = db.components().insertPrivateProject(); - ComponentDto project2 = db.components().insertPrivateProject(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); insertActivity("T1", project1, SUCCESS); insertActivity("T2", project2, FAILED); insertQueue("T3", project1, IN_PROGRESS); @@ -273,8 +273,8 @@ public class ActivityActionIT { @Test public void project_administrator_can_access_his_project_activity_using_component_key() { - ComponentDto project1 = db.components().insertPrivateProject(); - ComponentDto project2 = db.components().insertPrivateProject(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); // no need to be a system admin userSession.logIn().addProjectPermission(UserRole.ADMIN, project1); insertActivity("T1", project1, SUCCESS); @@ -290,7 +290,7 @@ public class ActivityActionIT { @Test public void return_401_if_user_is_not_logged_in() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.anonymous(); TestRequest request = ws.newRequest().setParam("componentId", project.uuid()); @@ -301,9 +301,9 @@ public class ActivityActionIT { @Test public void search_activity_by_component_name() { - ComponentDto struts = db.components().insertPrivateProject(c -> c.setName("old apache struts")); - ComponentDto zookeeper = db.components().insertPrivateProject(c -> c.setName("new apache zookeeper")); - ComponentDto eclipse = db.components().insertPrivateProject(c -> c.setName("eclipse")); + ComponentDto struts = db.components().insertPrivateProject(c -> c.setName("old apache struts")).getMainBranchComponent(); + ComponentDto zookeeper = db.components().insertPrivateProject(c -> c.setName("new apache zookeeper")).getMainBranchComponent(); + ComponentDto eclipse = db.components().insertPrivateProject(c -> c.setName("eclipse")).getMainBranchComponent(); db.components().insertSnapshot(struts); db.components().insertSnapshot(zookeeper); db.components().insertSnapshot(eclipse); @@ -331,7 +331,7 @@ public class ActivityActionIT { @Test public void search_activity_returns_application() { - ComponentDto apacheApp = db.components().insertPublicApplication(a -> a.setName("Apache App")); + ComponentDto apacheApp = db.components().insertPublicApplication(a -> a.setName("Apache App")).getMainBranchComponent(); db.components().insertSnapshot(apacheApp); logInAsSystemAdministrator(); insertActivity("T2", apacheApp, SUCCESS); @@ -344,7 +344,7 @@ public class ActivityActionIT { @Test public void search_task_id_in_queue_ignoring_other_parameters() { logInAsSystemAdministrator(); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); insertQueue("T1", project, IN_PROGRESS); ActivityResponse result = call( @@ -359,7 +359,7 @@ public class ActivityActionIT { @Test public void search_task_id_in_activity() { logInAsSystemAdministrator(); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); insertActivity("T1", project, SUCCESS); ActivityResponse result = call(ws.newRequest().setParam(Param.TEXT_QUERY, "T1")); @@ -386,7 +386,7 @@ public class ActivityActionIT { @Test public void branch_in_past_activity() { logInAsSystemAdministrator(); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(UserRole.USER, project); String branchName = "branch1"; ComponentDto branch = db.components().insertProjectBranch(project, b -> b.setBranchType(BRANCH).setKey(branchName)); @@ -428,7 +428,7 @@ public class ActivityActionIT { @Test public void pull_request_in_past_activity() { logInAsSystemAdministrator(); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(UserRole.USER, project); String pullRequestKey = RandomStringUtils.randomAlphanumeric(100); ComponentDto pullRequest = db.components().insertProjectBranch(project, b -> b.setBranchType(BranchType.PULL_REQUEST).setKey(pullRequestKey)); @@ -527,7 +527,7 @@ public class ActivityActionIT { @Test public void throws_IAE_if_page_is_higher_than_available() { logInAsSystemAdministrator(); - ComponentDto project1 = db.components().insertPrivateProject(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); insertActivity("T1", project1, SUCCESS); insertActivity("T2", project1, SUCCESS); @@ -581,9 +581,9 @@ public class ActivityActionIT { @Test public void filter_out_duplicate_tasks_in_progress_and_success() { logInAsSystemAdministrator(); - ComponentDto project1 = db.components().insertPrivateProject(); - ComponentDto project2 = db.components().insertPrivateProject(); - ComponentDto project3 = db.components().insertPrivateProject(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project3 = db.components().insertPrivateProject().getMainBranchComponent(); insertQueue("T2", project2, IN_PROGRESS); insertQueue("T3", project3, IN_PROGRESS); insertActivity("T1", project1, SUCCESS); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/ce/ws/ActivityStatusActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/ce/ws/ActivityStatusActionIT.java index 62c53ec9b8d..d3733ae5a9a 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/ce/ws/ActivityStatusActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/ce/ws/ActivityStatusActionIT.java @@ -91,8 +91,8 @@ public class ActivityStatusActionIT { public void status_for_a_project_as_project_admin() { String projectKey = "project-key"; String anotherProjectKey = "another-project-key"; - ComponentDto project = db.components().insertPrivateProject(c -> c.setKey(projectKey)); - ComponentDto anotherProject = db.components().insertPrivateProject(c -> c.setKey(anotherProjectKey)); + ComponentDto project = db.components().insertPrivateProject(c -> c.setKey(projectKey)).getMainBranchComponent(); + ComponentDto anotherProject = db.components().insertPrivateProject(c -> c.setKey(anotherProjectKey)).getMainBranchComponent(); userSession.logIn().addProjectPermission(UserRole.ADMIN, project); // pending tasks returned insertInQueue(CeQueueDto.Status.PENDING, project); @@ -117,7 +117,7 @@ public class ActivityStatusActionIT { @Test public void add_pending_time() { String projectKey = "project-key"; - ComponentDto project = db.components().insertPrivateProject(c -> c.setKey(projectKey)); + ComponentDto project = db.components().insertPrivateProject(c -> c.setKey(projectKey)).getMainBranchComponent(); userSession.logIn().addProjectPermission(UserRole.ADMIN, project); when(system2.now()).thenReturn(2000L); @@ -155,7 +155,7 @@ public class ActivityStatusActionIT { @Test public void throw_ForbiddenException_if_not_administrator_of_requested_project() { userSession.logIn(); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); String dbKey = project.getKey(); assertThatThrownBy(() -> callByComponentKey(dbKey)) diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/ce/ws/AnalysisStatusActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/ce/ws/AnalysisStatusActionIT.java index e9289fc9b19..5c8575ef09a 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/ce/ws/AnalysisStatusActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/ce/ws/AnalysisStatusActionIT.java @@ -73,7 +73,7 @@ public class AnalysisStatusActionIT { @Test public void no_errors_no_warnings() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.logIn().setSystemAdministrator().addProjectPermission(UserRole.USER, project); Ce.AnalysisStatusWsResponse response = ws.newRequest() @@ -85,7 +85,7 @@ public class AnalysisStatusActionIT { @Test public void allows_unauthenticated_access() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); userSession.registerComponents(project); SnapshotDto analysis = db.components().insertSnapshot(project); CeActivityDto activity = insertActivity("task-uuid" + counter++, project, SUCCESS, analysis, REPORT); @@ -101,7 +101,7 @@ public class AnalysisStatusActionIT { @Test public void return_warnings_for_last_analysis_of_main() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.logIn().setSystemAdministrator().addProjectPermission(UserRole.USER, project); SnapshotDto analysis = db.components().insertSnapshot(project); @@ -132,7 +132,7 @@ public class AnalysisStatusActionIT { @Test public void return_warnings_for_last_analysis_of_branch() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.logIn().setSystemAdministrator().addProjectPermission(UserRole.USER, project); ComponentDto branch = db.components().insertProjectBranch(project, b -> b.setKey(BRANCH_WITH_WARNING)); @@ -163,7 +163,7 @@ public class AnalysisStatusActionIT { @Test public void return_warnings_for_last_analysis_of_pull_request() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.logIn().setSystemAdministrator().addProjectPermission(UserRole.USER, project); ComponentDto pullRequest = db.components().insertProjectBranch(project, b -> { @@ -197,7 +197,7 @@ public class AnalysisStatusActionIT { @Test public void return_warnings_per_branch() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.logIn().setSystemAdministrator().addProjectPermission(UserRole.USER, project); SnapshotDto analysis = db.components().insertSnapshot(project); @@ -257,7 +257,7 @@ public class AnalysisStatusActionIT { @Test public void response_contains_branch_or_pullRequest_for_branch_or_pullRequest_only() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.logIn().setSystemAdministrator().addProjectPermission(UserRole.USER, project); db.components().insertProjectBranch(project, b -> b.setKey(BRANCH_WITHOUT_WARNING)); @@ -294,7 +294,7 @@ public class AnalysisStatusActionIT { @Test public void json_example() { ComponentDto project = db.components().insertPrivateProject(p -> p.setKey("com.github.kevinsawicki:http-request-parent") - .setName("HttpRequest")); + .setName("HttpRequest")).getMainBranchComponent(); SnapshotDto analysis = db.components().insertSnapshot(project); CeActivityDto activity = insertActivity("task-uuid" + counter++, project, SUCCESS, analysis, REPORT); CeTaskMessageDto ceTaskMessage = new CeTaskMessageDto() diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/ce/ws/CancelActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/ce/ws/CancelActionIT.java index 77b4a274191..2f300182b85 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/ce/ws/CancelActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/ce/ws/CancelActionIT.java @@ -61,7 +61,7 @@ public class CancelActionIT { @Test public void cancel_pending_task_on_project() { logInAsSystemAdministrator(); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); CeQueueDto queue = createTaskSubmit(project); tester.newRequest() @@ -86,7 +86,7 @@ public class CancelActionIT { @Test public void cancel_pending_task_when_system_administer() { logInAsSystemAdministrator(); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); CeQueueDto queue = createTaskSubmit(project); tester.newRequest() @@ -98,7 +98,7 @@ public class CancelActionIT { @Test public void cancel_pending_task_when_project_administer() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(UserRole.ADMIN, project); CeQueueDto queue = createTaskSubmit(project); @@ -130,7 +130,7 @@ public class CancelActionIT { @Test public void throw_ForbiddenException_if_not_enough_permission_when_canceling_task_on_project() { userSession.logIn().setNonSystemAdministrator(); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); CeQueueDto queue = createTaskSubmit(project); assertThatThrownBy(() -> { diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/ce/ws/ComponentActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/ce/ws/ComponentActionIT.java index e7135a4b9fc..4c9111b7182 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/ce/ws/ComponentActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/ce/ws/ComponentActionIT.java @@ -73,7 +73,7 @@ public class ComponentActionIT { @Test public void empty_queue_and_empty_activity() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(UserRole.USER, project); Ce.ComponentResponse response = ws.newRequest() @@ -86,9 +86,9 @@ public class ComponentActionIT { @Test public void project_tasks() { - ComponentDto project1 = db.components().insertPrivateProject(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); SnapshotDto analysisProject1 = db.components().insertSnapshot(project1); - ComponentDto project2 = db.components().insertPrivateProject(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(UserRole.USER, project1); insertActivity("T1", project1, CeActivityDto.Status.SUCCESS, analysisProject1); insertActivity("T2", project2, CeActivityDto.Status.FAILED, null); @@ -113,7 +113,7 @@ public class ComponentActionIT { @Test public void search_tasks_by_component_key() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); logInWithBrowsePermission(project); SnapshotDto analysis = db.components().insertSnapshot(project); insertActivity("T1", project, CeActivityDto.Status.SUCCESS, analysis); @@ -131,7 +131,7 @@ public class ComponentActionIT { @Test public void search_tasks_by_component() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); logInWithBrowsePermission(project); SnapshotDto analysis = db.components().insertSnapshot(project); insertActivity("T1", project, CeActivityDto.Status.SUCCESS, analysis); @@ -149,7 +149,7 @@ public class ComponentActionIT { @Test public void canceled_tasks_must_not_be_picked_as_current_analysis() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(UserRole.USER, project); insertActivity("T1", project, CeActivityDto.Status.SUCCESS); insertActivity("T2", project, CeActivityDto.Status.FAILED); @@ -171,7 +171,7 @@ public class ComponentActionIT { @Test public void branch_in_activity() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(UserRole.USER, project); String branchName = randomAlphanumeric(248); ComponentDto branch = db.components().insertProjectBranch(project, b -> b.setBranchType(BRANCH).setKey(branchName)); @@ -192,7 +192,7 @@ public class ComponentActionIT { @Test public void branch_in_queue_analysis() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(UserRole.USER, project); String branchName = randomAlphanumeric(248); ComponentDto branch = db.components().insertProjectBranch(project, b -> b.setBranchType(BRANCH).setKey(branchName)); @@ -216,7 +216,7 @@ public class ComponentActionIT { @Test public void return_many_tasks_from_same_project() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(UserRole.USER, project); insertQueue("Main", project, IN_PROGRESS); String branchName1 = "Branch1"; @@ -244,7 +244,7 @@ public class ComponentActionIT { @Test public void populates_warning_count_of_activities_but_not_warnings() { - ComponentDto privateProject = db.components().insertPrivateProject(); + ComponentDto privateProject = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(UserRole.USER, privateProject); SnapshotDto analysis = db.components().insertSnapshot(privateProject); CeActivityDto activity = insertActivity("Branch", privateProject, SUCCESS, analysis); @@ -277,7 +277,7 @@ public class ComponentActionIT { @Test public void throw_ForbiddenException_if_user_cant_access_project() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.logIn(); TestRequest request = ws.newRequest() @@ -290,7 +290,7 @@ public class ComponentActionIT { @Test public void fail_when_no_component_parameter() { - logInWithBrowsePermission(db.components().insertPrivateProject()); + logInWithBrowsePermission(db.components().insertPrivateProject().getMainBranchComponent()); TestRequest request = ws.newRequest(); assertThatThrownBy(request::execute) diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/ce/ws/DismissAnalysisWarningActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/ce/ws/DismissAnalysisWarningActionIT.java index 5b0bfa1c04b..e63ce21cfa7 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/ce/ws/DismissAnalysisWarningActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/ce/ws/DismissAnalysisWarningActionIT.java @@ -84,7 +84,7 @@ public class DismissAnalysisWarningActionIT { @Test public void return_403_if_user_has_no_browse_permission_on_private_project() { - ProjectDto project = db.components().insertPrivateProjectDto(); + ProjectDto project = db.components().insertPrivateProject().getProjectDto(); UserDto user = db.users().insertUser(); userSession.logIn(user); @@ -98,7 +98,7 @@ public class DismissAnalysisWarningActionIT { @Test public void return_204_on_success() { UserDto user = db.users().insertUser(); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.logIn(user).addProjectPermission(UserRole.USER, project); SnapshotDto analysis = db.components().insertSnapshot(project); CeActivityDto activity = insertActivity("task-uuid" + counter++, project, SUCCESS, analysis, REPORT); @@ -118,7 +118,7 @@ public class DismissAnalysisWarningActionIT { @Test public void is_idempotent() { UserDto user = db.users().insertUser(); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.logIn(user).addProjectPermission(UserRole.USER, project); SnapshotDto analysis = db.components().insertSnapshot(project); CeActivityDto activity = insertActivity("task-uuid" + counter++, project, SUCCESS, analysis, REPORT); @@ -142,7 +142,7 @@ public class DismissAnalysisWarningActionIT { @Test public void returns_400_if_warning_is_not_dismissable() { UserDto user = db.users().insertUser(); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.logIn(user).addProjectPermission(UserRole.USER, project); SnapshotDto analysis = db.components().insertSnapshot(project); CeActivityDto activity = insertActivity("task-uuid" + counter++, project, SUCCESS, analysis, REPORT); @@ -159,7 +159,7 @@ public class DismissAnalysisWarningActionIT { @Test public void returns_404_if_warning_does_not_exist() { UserDto user = db.users().insertUser(); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.logIn(user).addProjectPermission(UserRole.USER, project); SnapshotDto analysis = db.components().insertSnapshot(project); insertActivity("task-uuid" + counter++, project, SUCCESS, analysis, REPORT); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/ce/ws/TaskActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/ce/ws/TaskActionIT.java index 878a43014e0..bad7f04b69e 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/ce/ws/TaskActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/ce/ws/TaskActionIT.java @@ -78,9 +78,9 @@ public class TaskActionIT { @Before public void setUp() { - privateProject = db.components().insertPrivateProject(); + privateProject = db.components().insertPrivateProject().getMainBranchComponent(); userSession.logIn().addProjectPermission(ADMIN, privateProject); - publicProject = db.components().insertPublicProject(); + publicProject = db.components().insertPublicProject().getMainBranchComponent(); } @Test @@ -159,7 +159,7 @@ public class TaskActionIT { @Test public void branch_in_past_activity() { logInAsSystemAdministrator(); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(UserRole.USER, project); String branchName = randomAlphanumeric(248); ComponentDto branch = db.components().insertProjectBranch(project, b -> b.setBranchType(BRANCH).setKey(branchName)); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/component/ComponentCleanerServiceIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/component/ComponentCleanerServiceIT.java index 8a27c0aca4a..8ba028ae503 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/component/ComponentCleanerServiceIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/component/ComponentCleanerServiceIT.java @@ -19,7 +19,6 @@ */ package org.sonar.server.component; -import java.util.List; import org.junit.Rule; import org.junit.Test; import org.sonar.api.resources.ResourceType; @@ -87,8 +86,8 @@ public class ComponentCleanerServiceIT { @Test public void delete_component_from_db() { - ComponentDto componentDto1 = db.components().insertPublicProject(); - ComponentDto componentDto2 = db.components().insertPublicProject(); + ComponentDto componentDto1 = db.components().insertPublicProject().getMainBranchComponent(); + ComponentDto componentDto2 = db.components().insertPublicProject().getMainBranchComponent(); mockResourceTypeAsValidProject(); @@ -101,7 +100,7 @@ public class ComponentCleanerServiceIT { @Test public void fail_with_IAE_if_project_non_deletable() { - ComponentDto componentDto1 = db.components().insertPublicProject(); + ComponentDto componentDto1 = db.components().insertPublicProject().getMainBranchComponent(); mockResourceTypeAsNonDeletable(); dbSession.commit(); @@ -129,7 +128,7 @@ public class ComponentCleanerServiceIT { } private ProjectDto insertApplication(ProjectDto project) { - ProjectDto app = db.components().insertPublicApplicationDto(); + ProjectDto app = db.components().insertPublicApplication().getProjectDto(); db.components().addApplicationProject(app, project); return app; } @@ -150,13 +149,13 @@ public class ComponentCleanerServiceIT { @Test public void delete_webhooks_from_projects() { - ProjectDto project1 = db.components().insertPrivateProjectDto(); + ProjectDto project1 = db.components().insertPrivateProject().getProjectDto(); WebhookDto webhook1 = db.webhooks().insertWebhook(project1); db.webhookDelivery().insert(webhook1); - ProjectDto project2 = db.components().insertPrivateProjectDto(); + ProjectDto project2 = db.components().insertPrivateProject().getProjectDto(); WebhookDto webhook2 = db.webhooks().insertWebhook(project2); db.webhookDelivery().insert(webhook2); - ProjectDto projectNotToBeDeleted = db.components().insertPrivateProjectDto(); + ProjectDto projectNotToBeDeleted = db.components().insertPrivateProject().getProjectDto(); WebhookDto webhook3 = db.webhooks().insertWebhook(projectNotToBeDeleted); db.webhookDelivery().insert(webhook3); @@ -185,7 +184,7 @@ public class ComponentCleanerServiceIT { } private DbData insertProjectData() { - ComponentDto componentDto = db.components().insertPublicProject(); + ComponentDto componentDto = db.components().insertPublicProject().getMainBranchComponent(); ProjectDto project = dbClient.projectDao().selectByUuid(dbSession, componentDto.uuid()).get(); BranchDto branch = dbClient.branchDao().selectByUuid(dbSession, project.getUuid()).get(); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/component/ComponentFinderIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/component/ComponentFinderIT.java index a1c952d48e4..45ec4c907e3 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/component/ComponentFinderIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/component/ComponentFinderIT.java @@ -89,7 +89,7 @@ public class ComponentFinderIT { @Test public void fail_to_getByUuidOrKey_when_using_branch_uuid() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto branch = db.components().insertProjectBranch(project); String branchUuid = branch.uuid(); @@ -110,7 +110,7 @@ public class ComponentFinderIT { @Test public void fail_to_getByUuid_on_branch() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto branch = db.components().insertProjectBranch(project); String branchUuid = branch.uuid(); @@ -140,7 +140,7 @@ public class ComponentFinderIT { @Test public void get_component_by_key() { - db.components().insertPrivateProject(c -> c.setKey("project-key")); + db.components().insertPrivateProject(c -> c.setKey("project-key")).getMainBranchComponent(); ComponentDto component = underTest.getByUuidOrKey(dbSession, null, "project-key", ID_AND_KEY); @@ -149,7 +149,7 @@ public class ComponentFinderIT { @Test public void get_by_key_and_branch() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto branch = db.components().insertProjectBranch(project, b -> b.setKey("my_branch")); ComponentDto directory = db.components().insertComponent(newDirectory(branch, "scr")); ComponentDto file = db.components().insertComponent(newFileDto(branch, project.uuid())); @@ -161,7 +161,7 @@ public class ComponentFinderIT { @Test public void get_by_key_and_pull_request() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto branch = db.components().insertProjectBranch(project, b -> b.setKey("pr-123").setBranchType(PULL_REQUEST).setMergeBranchUuid(project.uuid())); ComponentDto directory = db.components().insertComponent(newDirectory(branch, "scr")); ComponentDto file = db.components().insertComponent(newFileDto(branch, project.uuid())); @@ -173,7 +173,7 @@ public class ComponentFinderIT { @Test public void get_optional_by_key_and_optional_branch_or_pull_request() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto pr = db.components().insertProjectBranch(project, b -> b.setKey("pr").setBranchType(PULL_REQUEST)); ComponentDto branch = db.components().insertProjectBranch(project, b -> b.setKey("branch")); ComponentDto branchFile = db.components().insertComponent(newFileDto(branch, project.uuid())); @@ -199,7 +199,7 @@ public class ComponentFinderIT { @Test public void fail_when_pull_request_branch_provided() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto pullRequest = db.components().insertProjectBranch(project, b -> b.setKey("pr-123").setBranchType(PULL_REQUEST)); String projectKey = project.getKey(); @@ -210,14 +210,14 @@ public class ComponentFinderIT { @Test public void get_by_key_and_branch_accept_main_branch() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); assertThat(underTest.getByKeyAndBranch(dbSession, project.getKey(), DEFAULT_MAIN_BRANCH_NAME).uuid()).isEqualTo(project.uuid()); } @Test public void fail_to_get_by_key_and_branch_when_branch_does_not_exist() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto branch = db.components().insertProjectBranch(project, b -> b.setKey("my_branch")); ComponentDto file = db.components().insertComponent(newFileDto(branch, project.uuid())); @@ -229,7 +229,7 @@ public class ComponentFinderIT { @Test public void get_main_branch_name_when_selecting_any_branch() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); // Copy project ComponentDto and rename it to be used by the branch ComponentDto project2 = project.copy(); @@ -244,7 +244,7 @@ public class ComponentFinderIT { @Test public void ignore_component_parent_name_when_not_branch() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto directory = db.components().insertComponent(newDirectory(project, "src")); ComponentDto file = db.components().insertComponent(newFileDto(project, directory) .setKey("org.struts:struts-core:src/org/struts/RequestContext.java") diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/component/ComponentServiceUpdateKeyIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/component/ComponentServiceUpdateKeyIT.java index 120d3aa307a..2052180e0ed 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/component/ComponentServiceUpdateKeyIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/component/ComponentServiceUpdateKeyIT.java @@ -70,7 +70,7 @@ public class ComponentServiceUpdateKeyIT { dbSession.commit(); logInAsProjectAdministrator(project); - underTest.updateKey(dbSession, componentDb.getProjectDto(project), "sample2:root"); + underTest.updateKey(dbSession, componentDb.getProjectDtoByMainBranch(project), "sample2:root"); dbSession.commit(); // Check project key has been updated @@ -105,7 +105,7 @@ public class ComponentServiceUpdateKeyIT { dbSession.commit(); logInAsProjectAdministrator(provisionedProject); - underTest.updateKey(dbSession, componentDb.getProjectDto(provisionedProject), "provisionedProject2"); + underTest.updateKey(dbSession, componentDb.getProjectDtoByMainBranch(provisionedProject), "provisionedProject2"); dbSession.commit(); assertComponentKeyHasBeenUpdated(provisionedProject.getKey(), "provisionedProject2"); @@ -117,7 +117,7 @@ public class ComponentServiceUpdateKeyIT { ComponentDto project = insertSampleProject(); userSession.logIn("john").addProjectPermission(UserRole.USER, project); - ProjectDto projectDto = componentDb.getProjectDto(project); + ProjectDto projectDto = componentDb.getProjectDtoByMainBranch(project); assertThatThrownBy(() -> underTest.updateKey(dbSession, projectDto, "sample2:root")) .isInstanceOf(ForbiddenException.class); } @@ -125,10 +125,10 @@ public class ComponentServiceUpdateKeyIT { @Test public void fail_if_old_key_and_new_key_are_the_same() { ComponentDto project = insertSampleProject(); - ComponentDto anotherProject = componentDb.insertPrivateProject(); + ComponentDto anotherProject = componentDb.insertPrivateProject().getMainBranchComponent(); logInAsProjectAdministrator(project); - ProjectDto projectDto = componentDb.getProjectDto(project); + ProjectDto projectDto = componentDb.getProjectDtoByMainBranch(project); String anotherProjectDbKey = anotherProject.getKey(); assertThatThrownBy(() -> underTest.updateKey(dbSession, projectDto, anotherProjectDbKey)) @@ -141,7 +141,7 @@ public class ComponentServiceUpdateKeyIT { ComponentDto project = insertSampleProject(); logInAsProjectAdministrator(project); - ProjectDto projectDto = componentDb.getProjectDto(project); + ProjectDto projectDto = componentDb.getProjectDtoByMainBranch(project); assertThatThrownBy(() -> underTest.updateKey(dbSession, projectDto, "")) .isInstanceOf(IllegalArgumentException.class) .hasMessage("Malformed key for ''. Allowed characters are alphanumeric, '-', '_', '.' and ':', with at least one non-digit."); @@ -152,7 +152,7 @@ public class ComponentServiceUpdateKeyIT { ComponentDto project = insertSampleProject(); logInAsProjectAdministrator(project); - ProjectDto projectDto = componentDb.getProjectDto(project); + ProjectDto projectDto = componentDb.getProjectDtoByMainBranch(project); assertThatThrownBy(() -> underTest.updateKey(dbSession, projectDto, "sample?root")) .isInstanceOf(IllegalArgumentException.class) .hasMessage("Malformed key for 'sample?root'. Allowed characters are alphanumeric, '-', '_', '.' and ':', with at least one non-digit."); @@ -163,7 +163,7 @@ public class ComponentServiceUpdateKeyIT { } private ComponentDto insertProject(String key) { - return componentDb.insertPrivateProject(c -> c.setKey(key)); + return componentDb.insertPrivateProject(c -> c.setKey(key)).getMainBranchComponent(); } private void assertComponentKeyHasBeenUpdated(String oldKey, String newKey) { diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/component/ComponentUpdaterIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/component/ComponentUpdaterIT.java index 0ded9bc71ac..5dc1ea73b8c 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/component/ComponentUpdaterIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/component/ComponentUpdaterIT.java @@ -239,7 +239,7 @@ public class ComponentUpdaterIT { @Test public void do_not_add_project_to_user_favorites_if_project_creator_is_defined_in_permission_template_and_already_100_favorites() { UserDto user = db.users().insertUser(); - rangeClosed(1, 100).forEach(i -> db.favorites().add(db.components().insertPrivateProject(), user.getUuid(), user.getLogin())); + rangeClosed(1, 100).forEach(i -> db.favorites().add(db.components().insertPrivateProject().getMainBranchComponent(), user.getUuid(), user.getLogin())); NewComponent project = NewComponent.newComponentBuilder() .setKey(DEFAULT_PROJECT_KEY) .setName(DEFAULT_PROJECT_NAME) @@ -281,7 +281,7 @@ public class ComponentUpdaterIT { @Test public void fail_when_project_key_already_exists() { - ComponentDto existing = db.components().insertPrivateProject(); + ComponentDto existing = db.components().insertPrivateProject().getMainBranchComponent(); DbSession session = db.getSession(); NewComponent newComponent = NewComponent.newComponentBuilder() @@ -320,7 +320,7 @@ public class ComponentUpdaterIT { @Test public void create_shouldFail_whenCreatingProjectWithExistingKeyButDifferentCase() { String existingKey = randomAlphabetic(5).toUpperCase(); - db.components().insertPrivateProject(component -> component.setKey(existingKey)); + db.components().insertPrivateProject(component -> component.setKey(existingKey)).getMainBranchComponent(); String newKey = existingKey.toLowerCase(); NewComponent newComponent = NewComponent.newComponentBuilder() diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/component/ws/AppActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/component/ws/AppActionIT.java index 5323a547210..0e90200040a 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/component/ws/AppActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/component/ws/AppActionIT.java @@ -24,10 +24,8 @@ import org.junit.Rule; import org.junit.Test; import org.sonar.api.server.ws.WebService; import org.sonar.db.DbTester; -import org.sonar.db.component.BranchDto; import org.sonar.db.component.ComponentDto; import org.sonar.db.metric.MetricDto; -import org.sonar.db.project.ProjectDto; import org.sonar.server.component.TestComponentFinder; import org.sonar.server.exceptions.ForbiddenException; import org.sonar.server.exceptions.NotFoundException; @@ -64,7 +62,7 @@ public class AppActionIT { @Test public void file_info() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto directory = db.components().insertComponent(newDirectory(project, "src")); ComponentDto file = db.components().insertComponent(newFileDto(project, directory)); userSession.logIn("john").addProjectPermission(USER, project); @@ -91,7 +89,7 @@ public class AppActionIT { @Test public void file_on_module() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto directory = db.components().insertComponent(newDirectory(project, "src")); ComponentDto file = db.components().insertComponent(newFileDto(project, directory)); userSession.logIn("john").addProjectPermission(USER, project); @@ -118,7 +116,7 @@ public class AppActionIT { @Test public void file_without_measures() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); userSession.logIn("john").addProjectPermission(USER, project); @@ -134,7 +132,7 @@ public class AppActionIT { @Test public void file_with_measures() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto directory = db.components().insertComponent(newDirectory(project, "src")); ComponentDto file = db.components().insertComponent(newFileDto(project, directory)); MetricDto lines = db.measures().insertMetric(m -> m.setKey(LINES_KEY)); @@ -169,7 +167,7 @@ public class AppActionIT { @Test public void get_by_component() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project, project)); MetricDto coverage = db.measures().insertMetric(m -> m.setKey(COVERAGE_KEY)); db.measures().insertLiveMeasure(file, coverage, m -> m.setValue(95.4d)); @@ -191,7 +189,7 @@ public class AppActionIT { @Test public void canMarkAsFavorite_is_true_when_logged() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.logIn("john").addProjectPermission(USER, project); String result = ws.newRequest() @@ -206,7 +204,7 @@ public class AppActionIT { @Test public void canMarkAsFavorite_is_false_when_not_logged() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(USER, project); String result = ws.newRequest() @@ -221,7 +219,7 @@ public class AppActionIT { @Test public void component_is_favorite() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.logIn("john").addProjectPermission(USER, project); db.favorites().add(project, userSession.getUuid(), userSession.getLogin()); @@ -237,7 +235,7 @@ public class AppActionIT { @Test public void component_is_not_favorite() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.logIn("john").addProjectPermission(USER, project); String result = ws.newRequest() @@ -252,7 +250,7 @@ public class AppActionIT { @Test public void branch() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.logIn("john").addProjectPermission(USER, project); String branchName = randomAlphanumeric(248); ComponentDto branch = db.components().insertProjectBranch(project, b -> b.setKey(branchName)); @@ -296,7 +294,7 @@ public class AppActionIT { @Test public void component_and_branch_parameters_provided() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.logIn("john").addProjectPermission(USER, project); String branchName = randomAlphanumeric(248); ComponentDto branch = db.components().insertProjectBranch(project, b -> b.setKey(branchName)); @@ -327,7 +325,7 @@ public class AppActionIT { @Test public void component_and_pull_request_parameters_provided() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.logIn("john").addProjectPermission(USER, project); String pullRequestKey = RandomStringUtils.randomAlphanumeric(100); ComponentDto branch = db.components().insertProjectBranch(project, b -> b.setBranchType(PULL_REQUEST).setKey(pullRequestKey)); @@ -358,7 +356,7 @@ public class AppActionIT { @Test public void fail_if_component_and_pull_request_and_branch_parameters_provided() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.logIn("john").addProjectPermission(USER, project); ComponentDto branch = db.components().insertProjectBranch(project, b -> b.setBranchType(PULL_REQUEST)); ComponentDto file = db.components().insertComponent(newFileDto(branch, project.uuid())); @@ -374,7 +372,7 @@ public class AppActionIT { @Test public void fail_when_component_not_found() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); TestRequest request = ws.newRequest() @@ -385,7 +383,7 @@ public class AppActionIT { @Test public void fail_when_branch_not_found() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto branch = db.components().insertProjectBranch(project); ComponentDto file = db.components().insertComponent(newFileDto(branch, project.uuid())); @@ -399,7 +397,7 @@ public class AppActionIT { @Test public void fail_when_missing_permission() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); TestRequest request = ws.newRequest() diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/component/ws/SearchActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/component/ws/SearchActionIT.java index cee0b778bfb..d7c4fbf3585 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/component/ws/SearchActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/component/ws/SearchActionIT.java @@ -120,8 +120,8 @@ public class SearchActionIT { @Test public void search_by_key_query() { - ComponentDto p1 = db.components().insertPrivateProject(p -> p.setKey("project-_%-key")); - ComponentDto p2 = db.components().insertPrivateProject(p -> p.setKey("project-key-without-escaped-characters")); + ComponentDto p1 = db.components().insertPrivateProject(p -> p.setKey("project-_%-key")).getMainBranchComponent(); + ComponentDto p2 = db.components().insertPrivateProject(p -> p.setKey("project-key-without-escaped-characters")).getMainBranchComponent(); insertProjectsAuthorizedForUser(List.of(p1, p2)); SearchWsResponse response = call(new SearchRequest().setQuery("project-_%-key").setQualifiers(singletonList(PROJECT))); @@ -134,7 +134,7 @@ public class SearchActionIT { List componentDtoList = new ArrayList<>(); for (int i = 1; i <= 9; i++) { int j = i; - componentDtoList.add(db.components().insertPrivateProject("project-uuid-" + j, p -> p.setKey("project-key-" + j).setName("Project Name " + j))); + componentDtoList.add(db.components().insertPrivateProject("project-uuid-" + j, p -> p.setKey("project-key-" + j).setName("Project Name " + j)).getMainBranchComponent()); } insertProjectsAuthorizedForUser(componentDtoList); @@ -145,8 +145,8 @@ public class SearchActionIT { @Test public void return_only_projects_on_which_user_has_browse_permission() { - ComponentDto project1 = db.components().insertPrivateProject(); - ComponentDto project2 = db.components().insertPrivateProject(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto portfolio = db.components().insertPrivatePortfolio(); setBrowsePermissionOnUserAndIndex(List.of(project1)); @@ -160,7 +160,7 @@ public class SearchActionIT { @Test public void return_project_key() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto dir1 = newDirectory(project, "dir1").setKey("dir1"); ComponentDto dir2 = newDirectory(project, "dir2").setKey("dir2"); ComponentDto dir3 = newDirectory(project, "dir3").setKey("dir3"); @@ -175,7 +175,7 @@ public class SearchActionIT { @Test public void does_not_return_branches() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto branch = db.components().insertProjectBranch(project); setBrowsePermissionOnUserAndIndex(List.of(project, branch)); @@ -204,7 +204,7 @@ public class SearchActionIT { @Test public void test_json_example() { db.components().insertComponent(newPortfolio()); - ComponentDto project = db.components().insertPrivateProject("project-uuid", p -> p.setName("Project Name").setKey("project-key")); + ComponentDto project = db.components().insertPrivateProject("project-uuid", p -> p.setName("Project Name").setKey("project-key")).getMainBranchComponent(); ComponentDto directory = newDirectory(project, "path/to/directoy").setUuid("directory-uuid").setKey("directory-key").setName("Directory Name"); ComponentDto view = newPortfolio(); db.components().insertComponents(directory, view); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/component/ws/SearchProjectsActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/component/ws/SearchProjectsActionIT.java index 666b5cb8e2e..0633c3e6c9a 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/component/ws/SearchProjectsActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/component/ws/SearchProjectsActionIT.java @@ -240,7 +240,7 @@ public class SearchProjectsActionIT { p -> p.setTagsString("finance, java"), new Measure(coverage, c -> c.setValue(80d))); - db.components().insertProjectBranch(db.components().getProjectDto(project1), branchDto -> branchDto.setNeedIssueSync(true)); + db.components().insertProjectBranch(db.components().getProjectDtoByMainBranch(project1), branchDto -> branchDto.setNeedIssueSync(true)); ComponentDto project2 = insertProject( c -> c.setKey(KEY_PROJECT_EXAMPLE_002).setName("My Project 2"), @@ -1184,15 +1184,15 @@ public class SearchProjectsActionIT { @Test public void sort_by_last_analysis_date() { userSession.logIn(); - ComponentDto project1 = db.components().insertPublicProject(p -> p.setKey("project1")); + ComponentDto project1 = db.components().insertPublicProject(p -> p.setKey("project1")).getMainBranchComponent(); authorizationIndexerTester.allowOnlyAnyone(project1); - ComponentDto project2 = db.components().insertPublicProject(p -> p.setKey("project2")); + ComponentDto project2 = db.components().insertPublicProject(p -> p.setKey("project2")).getMainBranchComponent(); db.components().insertSnapshot(project2, snapshot -> snapshot.setCreatedAt(40_000_000_000L).setLast(true)); authorizationIndexerTester.allowOnlyAnyone(project2); - ComponentDto project3 = db.components().insertPublicProject(p -> p.setKey("project3")); + ComponentDto project3 = db.components().insertPublicProject(p -> p.setKey("project3")).getMainBranchComponent(); db.components().insertSnapshot(project3, snapshot -> snapshot.setCreatedAt(20_000_000_000L).setLast(true)); authorizationIndexerTester.allowOnlyAnyone(project3); - ComponentDto project4 = db.components().insertPublicProject(p -> p.setKey("project4")); + ComponentDto project4 = db.components().insertPublicProject(p -> p.setKey("project4")).getMainBranchComponent(); db.components().insertSnapshot(project4, snapshot -> snapshot.setCreatedAt(10_000_000_000L).setLast(false)); db.components().insertSnapshot(project4, snapshot -> snapshot.setCreatedAt(30_000_000_000L).setLast(true)); authorizationIndexerTester.allowOnlyAnyone(project4); @@ -1208,15 +1208,15 @@ public class SearchProjectsActionIT { @Test public void return_last_analysis_date() { userSession.logIn(); - ComponentDto project1 = db.components().insertPublicProject(); + ComponentDto project1 = db.components().insertPublicProject().getMainBranchComponent(); db.components().insertSnapshot(project1, snapshot -> snapshot.setCreatedAt(10_000_000_000L).setLast(false)); db.components().insertSnapshot(project1, snapshot -> snapshot.setCreatedAt(20_000_000_000L).setLast(true)); authorizationIndexerTester.allowOnlyAnyone(project1); - ComponentDto project2 = db.components().insertPublicProject(); + ComponentDto project2 = db.components().insertPublicProject().getMainBranchComponent(); db.components().insertSnapshot(project2, snapshot -> snapshot.setCreatedAt(30_000_000_000L).setLast(true)); authorizationIndexerTester.allowOnlyAnyone(project2); // No snapshot on project 3 - ComponentDto project3 = db.components().insertPublicProject(); + ComponentDto project3 = db.components().insertPublicProject().getMainBranchComponent(); authorizationIndexerTester.allowOnlyAnyone(project3); index(); @@ -1233,15 +1233,15 @@ public class SearchProjectsActionIT { public void return_leak_period_date() { when(editionProviderMock.get()).thenReturn(Optional.of(Edition.ENTERPRISE)); userSession.logIn(); - ComponentDto project1 = db.components().insertPublicProject(); + ComponentDto project1 = db.components().insertPublicProject().getMainBranchComponent(); db.components().insertSnapshot(project1, snapshot -> snapshot.setPeriodDate(10_000_000_000L)); authorizationIndexerTester.allowOnlyAnyone(project1); // No leak period - ComponentDto project2 = db.components().insertPublicProject(); + ComponentDto project2 = db.components().insertPublicProject().getMainBranchComponent(); db.components().insertSnapshot(project2, snapshot -> snapshot.setPeriodDate(null)); authorizationIndexerTester.allowOnlyAnyone(project2); // No snapshot on project 3 - ComponentDto project3 = db.components().insertPublicProject(); + ComponentDto project3 = db.components().insertPublicProject().getMainBranchComponent(); authorizationIndexerTester.allowOnlyAnyone(project3); MetricDto leakProjects = db.measures().insertMetric(c -> c.setKey(LEAK_PROJECTS_KEY).setValueType(DATA.name())); @@ -1265,9 +1265,9 @@ public class SearchProjectsActionIT { @Test public void return_visibility_flag() { userSession.logIn(); - ComponentDto privateProject = db.components().insertPublicProject(); + ComponentDto privateProject = db.components().insertPublicProject().getMainBranchComponent(); authorizationIndexerTester.allowOnlyAnyone(privateProject); - ComponentDto publicProject = db.components().insertPrivateProject(); + ComponentDto publicProject = db.components().insertPrivateProject().getMainBranchComponent(); authorizationIndexerTester.allowOnlyAnyone(publicProject); index(); @@ -1281,7 +1281,7 @@ public class SearchProjectsActionIT { @Test public void does_not_return_branches() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); authorizationIndexerTester.allowOnlyAnyone(project); ComponentDto branch = db.components().insertProjectBranch(project); index(); @@ -1377,7 +1377,7 @@ public class SearchProjectsActionIT { private ComponentDto insertProject(Consumer componentConsumer, Consumer projectConsumer, Measure... measures) { - ComponentDto project = db.components().insertPublicProject(componentConsumer, projectConsumer); + ComponentDto project = db.components().insertPublicProject(componentConsumer, projectConsumer).getMainBranchComponent(); Arrays.stream(measures).forEach(m -> db.measures().insertLiveMeasure(project, m.metric, m.consumer)); return project; } @@ -1387,7 +1387,7 @@ public class SearchProjectsActionIT { } private ComponentDto insertApplication(Consumer componentConsumer, Measure... measures) { - ComponentDto application = db.components().insertPublicApplication(componentConsumer); + ComponentDto application = db.components().insertPublicApplication(componentConsumer).getMainBranchComponent(); Arrays.stream(measures).forEach(m -> db.measures().insertLiveMeasure(application, m.metric, m.consumer)); return application; } diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/component/ws/ShowActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/component/ws/ShowActionIT.java index 55e8fc57321..e8f6908b446 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/component/ws/ShowActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/component/ws/ShowActionIT.java @@ -135,7 +135,7 @@ public class ShowActionIT { @Test public void show_with_ancestors_when_not_project() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto directory = db.components().insertComponent(newDirectory(project, "dir")); ComponentDto file = db.components().insertComponent(newFileDto(project, directory)); userSession.addProjectPermission(USER, project); @@ -148,7 +148,7 @@ public class ShowActionIT { @Test public void show_without_ancestors_when_project() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(USER, project); ShowWsResponse response = newRequest(project.getKey()); @@ -159,7 +159,7 @@ public class ShowActionIT { @Test public void show_with_last_analysis_date() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); db.components().insertSnapshots( newAnalysis(project).setCreatedAt(1_000_000_000L).setLast(false), newAnalysis(project).setCreatedAt(2_000_000_000L).setLast(false), @@ -173,7 +173,7 @@ public class ShowActionIT { @Test public void show_with_new_code_period_date() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); db.components().insertSnapshots( newAnalysis(project).setPeriodDate(1_000_000_000L).setLast(false), newAnalysis(project).setPeriodDate(2_000_000_000L).setLast(false), @@ -188,7 +188,7 @@ public class ShowActionIT { @Test public void show_with_ancestors_and_analysis_date() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); db.components().insertSnapshot(newAnalysis(project).setCreatedAt(3_000_000_000L).setLast(true)); ComponentDto directory = db.components().insertComponent(newDirectory(project, "dir")); ComponentDto file = db.components().insertComponent(newFileDto(project, directory)); @@ -203,7 +203,7 @@ public class ShowActionIT { @Test public void should_return_visibility_for_private_project() { - ComponentDto privateProject = db.components().insertPrivateProject(); + ComponentDto privateProject = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(USER, privateProject); ShowWsResponse result = newRequest(privateProject.getKey()); @@ -213,7 +213,7 @@ public class ShowActionIT { @Test public void should_return_visibility_for_public_project() { - ComponentDto publicProject = db.components().insertPublicProject(); + ComponentDto publicProject = db.components().insertPublicProject().getMainBranchComponent(); userSession.registerComponents(publicProject); ShowWsResponse result = newRequest(publicProject.getKey()); @@ -232,7 +232,7 @@ public class ShowActionIT { @Test public void display_version() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto directory = db.components().insertComponent(newDirectory(project, "dir")); ComponentDto file = db.components().insertComponent(newFileDto(project, directory)); db.components().insertSnapshot(project, s -> s.setProjectVersion("1.1")); @@ -248,7 +248,7 @@ public class ShowActionIT { @Test public void branch() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(UserRole.USER, project); String branchKey = "my_branch"; ComponentDto branch = db.components().insertProjectBranch(project, b -> b.setKey(branchKey)); @@ -273,7 +273,7 @@ public class ShowActionIT { @Test public void dont_show_branch_if_main_branch() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(UserRole.USER, project); ShowWsResponse response = ws.newRequest() @@ -288,7 +288,7 @@ public class ShowActionIT { @Test public void pull_request() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(UserRole.USER, project); String pullRequest = "pr-1234"; ComponentDto branch = db.components().insertProjectBranch(project, b -> b.setKey(pullRequest).setBranchType(PULL_REQUEST)); @@ -318,14 +318,14 @@ public class ShowActionIT { ComponentDto subview = db.components().insertSubView(portfolio1); String pullRequestKey1 = randomAlphanumeric(100); - ComponentDto project1 = db.components().insertPrivateProject(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto branch1 = db.components().insertProjectBranch(project1, b -> b.setBranchType(PULL_REQUEST).setKey(pullRequestKey1) .setNeedIssueSync(true)); ComponentDto directory = db.components().insertComponent(newDirectoryOnBranch(branch1, "dir", project1.uuid())); ComponentDto file = db.components().insertComponent(newFileDto(project1.uuid(), branch1, directory)); userSession.addProjectBranchMapping(project1.uuid(), branch1); - ComponentDto project2 = db.components().insertPrivateProject(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); String branchName2 = randomAlphanumeric(248); ComponentDto branch2 = db.components().insertProjectBranch(project2, b -> b.setBranchType(BRANCH).setNeedIssueSync(true).setKey(branchName2)); String branchName3 = randomAlphanumeric(248); @@ -333,7 +333,7 @@ public class ShowActionIT { userSession.addProjectBranchMapping(project2.uuid(), branch2); userSession.addProjectBranchMapping(project2.uuid(), branch3); - ComponentDto project3 = db.components().insertPrivateProject(); + ComponentDto project3 = db.components().insertPrivateProject().getMainBranchComponent(); String pullRequestKey4 = randomAlphanumeric(100); ComponentDto branch4 = db.components().insertProjectBranch(project3, b -> b.setBranchType(PULL_REQUEST).setKey(pullRequestKey4).setNeedIssueSync(false)); ComponentDto directoryOfBranch4 = db.components().insertComponent(newDirectoryOnBranch(branch4, "dir", project3.uuid())); @@ -414,7 +414,7 @@ public class ShowActionIT { @Test public void fail_if_branch_does_not_exist() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); userSession.addProjectPermission(UserRole.USER, project); db.components().insertProjectBranch(project, b -> b.setKey("my_branch")); @@ -438,12 +438,12 @@ public class ShowActionIT { private void insertJsonExampleComponentsAndSnapshots() { ComponentDto project = db.components().insertPrivateProject(c -> c.setUuid("AVIF98jgA3Ax6PH2efOW") - .setBranchUuid("AVIF98jgA3Ax6PH2efOW") - .setKey("com.sonarsource:java-markdown") - .setName("Java Markdown") - .setDescription("Java Markdown Project") - .setQualifier(Qualifiers.PROJECT), - p -> p.setTagsString("language, plugin")); + .setBranchUuid("AVIF98jgA3Ax6PH2efOW") + .setKey("com.sonarsource:java-markdown") + .setName("Java Markdown") + .setDescription("Java Markdown Project") + .setQualifier(Qualifiers.PROJECT), + p -> p.setTagsString("language, plugin")).getMainBranchComponent(); userSession.addProjectPermission(USER, project); db.components().insertSnapshot(project, snapshot -> snapshot .setProjectVersion("1.1") diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/component/ws/SuggestionsActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/component/ws/SuggestionsActionIT.java index 2c868f1c3e4..939a3fb9b8c 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/component/ws/SuggestionsActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/component/ws/SuggestionsActionIT.java @@ -132,8 +132,8 @@ public class SuggestionsActionIT { @Test public void test_example_json_response() { - ComponentDto project1 = db.components().insertPublicProject(p -> p.setKey("org.sonarsource:sonarqube").setName("SonarSource :: SonarQube")); - ComponentDto project2 = db.components().insertPublicProject(p -> p.setKey("org.sonarsource:sonarlint").setName("SonarSource :: SonarLint")); + ComponentDto project1 = db.components().insertPublicProject(p -> p.setKey("org.sonarsource:sonarqube").setName("SonarSource :: SonarQube")).getMainBranchComponent(); + ComponentDto project2 = db.components().insertPublicProject(p -> p.setKey("org.sonarsource:sonarlint").setName("SonarSource :: SonarLint")).getMainBranchComponent(); componentIndexer.indexAll(); authorizationIndexerTester.allowOnlyAnyone(project1); authorizationIndexerTester.allowOnlyAnyone(project2); @@ -150,7 +150,7 @@ public class SuggestionsActionIT { @Test public void suggestions_without_query_should_contain_recently_browsed() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); componentIndexer.indexAll(); userSessionRule.addProjectPermission(USER, project); @@ -175,7 +175,7 @@ public class SuggestionsActionIT { @Test public void suggestions_without_query_should_contain_recently_browsed_public_project() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); componentIndexer.indexAll(); @@ -199,7 +199,7 @@ public class SuggestionsActionIT { @Test public void suggestions_without_query_should_not_contain_recently_browsed_without_permission() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); componentIndexer.indexAll(); @@ -215,7 +215,7 @@ public class SuggestionsActionIT { @Test public void suggestions_without_query_should_contain_favorites() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); doReturn(singletonList(project)).when(favoriteFinder).list(); componentIndexer.indexAll(); @@ -240,7 +240,7 @@ public class SuggestionsActionIT { @Test public void suggestions_without_query_should_not_contain_favorites_without_permission() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); doReturn(singletonList(project)).when(favoriteFinder).list(); componentIndexer.indexAll(); @@ -256,7 +256,7 @@ public class SuggestionsActionIT { @Test public void suggestions_without_query_should_contain_recently_browsed_favorites() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); doReturn(singletonList(project)).when(favoriteFinder).list(); componentIndexer.indexAll(); @@ -282,7 +282,7 @@ public class SuggestionsActionIT { @Test public void suggestions_without_query_should_not_contain_matches_that_are_neither_favorites_nor_recently_browsed() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); componentIndexer.indexAll(); userSessionRule.addProjectPermission(USER, project); @@ -300,10 +300,10 @@ public class SuggestionsActionIT { @Test public void suggestions_without_query_should_order_results() { - ComponentDto project1 = db.components().insertPrivateProject(p -> p.setName("Alpha")); - ComponentDto project2 = db.components().insertPrivateProject(p -> p.setName("Bravo")); - ComponentDto project3 = db.components().insertPrivateProject(p -> p.setName("Charlie")); - ComponentDto project4 = db.components().insertPrivateProject(p -> p.setName("Delta")); + ComponentDto project1 = db.components().insertPrivateProject(p -> p.setName("Alpha")).getMainBranchComponent(); + ComponentDto project2 = db.components().insertPrivateProject(p -> p.setName("Bravo")).getMainBranchComponent(); + ComponentDto project3 = db.components().insertPrivateProject(p -> p.setName("Charlie")).getMainBranchComponent(); + ComponentDto project4 = db.components().insertPrivateProject(p -> p.setName("Delta")).getMainBranchComponent(); doReturn(asList(project4, project2)).when(favoriteFinder).list(); componentIndexer.indexAll(); @@ -330,7 +330,7 @@ public class SuggestionsActionIT { @Test public void suggestions_without_query_should_return_empty_qualifiers() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); componentIndexer.indexOnAnalysis(project.branchUuid()); userSessionRule.addProjectPermission(USER, project); @@ -348,7 +348,7 @@ public class SuggestionsActionIT { @Test public void suggestions_should_filter_allowed_qualifiers() { resourceTypes.setAllQualifiers(PROJECT, FILE, UNIT_TEST_FILE); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); componentIndexer.indexOnAnalysis(project.branchUuid()); userSessionRule.addProjectPermission(USER, project); @@ -364,7 +364,7 @@ public class SuggestionsActionIT { @Test public void exact_match_in_one_qualifier() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); componentIndexer.indexAll(); authorizationIndexerTester.allowOnlyAnyone(project); @@ -389,7 +389,7 @@ public class SuggestionsActionIT { @Test public void should_not_return_suggestion_on_non_existing_project() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); componentIndexer.indexAll(); authorizationIndexerTester.allowOnlyAnyone(project); @@ -410,7 +410,7 @@ public class SuggestionsActionIT { @Test public void must_not_search_if_no_valid_tokens_are_provided() { - ComponentDto project = db.components().insertPrivateProject(p -> p.setName("SonarQube")); + ComponentDto project = db.components().insertPrivateProject(p -> p.setName("SonarQube")).getMainBranchComponent(); componentIndexer.indexAll(); authorizationIndexerTester.allowOnlyAnyone(project); @@ -436,7 +436,7 @@ public class SuggestionsActionIT { @Test public void should_warn_about_short_inputs_but_return_results_based_on_other_terms() { - ComponentDto project = db.components().insertPrivateProject(p -> p.setName("SonarQube")); + ComponentDto project = db.components().insertPrivateProject(p -> p.setName("SonarQube")).getMainBranchComponent(); componentIndexer.indexAll(); authorizationIndexerTester.allowOnlyAnyone(project); @@ -455,7 +455,7 @@ public class SuggestionsActionIT { @Test public void should_contain_component_names() { - ComponentDto project1 = db.components().insertPrivateProject(p -> p.setName("Project1")); + ComponentDto project1 = db.components().insertPrivateProject(p -> p.setName("Project1")).getMainBranchComponent(); componentIndexer.indexOnAnalysis(project1.branchUuid()); authorizationIndexerTester.allowOnlyAnyone(project1); @@ -472,7 +472,7 @@ public class SuggestionsActionIT { @Test public void should_mark_recently_browsed_items() { - ComponentDto project = db.components().insertPrivateProject(p -> p.setName("ProjectTest")); + ComponentDto project = db.components().insertPrivateProject(p -> p.setName("ProjectTest")).getMainBranchComponent(); ComponentDto file1 = newFileDto(project).setName("File1"); ComponentDto file2 = newFileDto(project).setName("File2"); componentIndexer.indexOnAnalysis(project.branchUuid()); @@ -492,8 +492,8 @@ public class SuggestionsActionIT { @Test public void should_mark_favorite_items() { - ComponentDto favouriteProject = db.components().insertPrivateProject(p -> p.setName("Project1")); - ComponentDto nonFavouriteProject = db.components().insertPublicProject(p -> p.setName("Project2")); + ComponentDto favouriteProject = db.components().insertPrivateProject(p -> p.setName("Project1")).getMainBranchComponent(); + ComponentDto nonFavouriteProject = db.components().insertPublicProject(p -> p.setName("Project2")).getMainBranchComponent(); doReturn(singletonList(favouriteProject)).when(favoriteFinder).list(); componentIndexer.indexOnAnalysis(favouriteProject.branchUuid()); @@ -513,7 +513,7 @@ public class SuggestionsActionIT { @Test public void should_return_empty_qualifiers() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); componentIndexer.indexOnAnalysis(project.branchUuid()); authorizationIndexerTester.allowOnlyAnyone(project); @@ -531,10 +531,10 @@ public class SuggestionsActionIT { public void should_only_provide_project_for_certain_qualifiers() { String query = randomAlphabetic(10); - ComponentDto app = db.components().insertPublicApplication(v -> v.setName(query)); + ComponentDto app = db.components().insertPublicApplication(v -> v.setName(query)).getMainBranchComponent(); ComponentDto view = db.components().insertPublicPortfolio(v -> v.setName(query)); ComponentDto subView = db.components().insertComponent(ComponentTesting.newSubPortfolio(view).setName(query)); - ComponentDto project = db.components().insertPrivateProject(p -> p.setName(query)); + ComponentDto project = db.components().insertPrivateProject(p -> p.setName(query)).getMainBranchComponent(); ComponentDto dir = db.components().insertComponent(ComponentTesting.newDirectory(project, "path").setName(query)); ComponentDto file = db.components().insertComponent(ComponentTesting.newFileDto(project, dir).setName(query)); ComponentDto test = db.components().insertComponent(ComponentTesting.newFileDto(project, dir).setName(query).setQualifier(UNIT_TEST_FILE)); @@ -559,7 +559,7 @@ public class SuggestionsActionIT { @Test public void does_not_return_branches() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); authorizationIndexerTester.allowOnlyAnyone(project); ComponentDto branch = db.components().insertProjectBranch(project); componentIndexer.indexAll(); @@ -678,7 +678,7 @@ public class SuggestionsActionIT { String namePrefix = "MyProject"; List projects = range(0, numberOfProjects) - .mapToObj(i -> db.components().insertPublicProject(p -> p.setName(namePrefix + i))) + .mapToObj(i -> db.components().insertPublicProject(p -> p.setName(namePrefix + i)).getMainBranchComponent()) .collect(Collectors.toList()); componentIndexer.indexAll(); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/component/ws/TreeActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/component/ws/TreeActionIT.java index e353afcbe5f..91169002ce2 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/component/ws/TreeActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/component/ws/TreeActionIT.java @@ -298,10 +298,10 @@ public class TreeActionIT { String appBranchName = "app-branch"; String projectBranchName = "project-branch"; - ComponentDto application = db.components().insertPrivateProject(c -> c.setQualifier(APP).setKey("app-key")); + ComponentDto application = db.components().insertPrivateProject(c -> c.setQualifier(APP).setKey("app-key")).getMainBranchComponent(); ComponentDto applicationBranch = db.components().insertProjectBranch(application, a -> a.setKey(appBranchName)); - ComponentDto project = db.components().insertPrivateProject(p -> p.setKey("project-key")); + ComponentDto project = db.components().insertPrivateProject(p -> p.setKey("project-key")).getMainBranchComponent(); ComponentDto projectBranch = db.components().insertProjectBranch(project, b -> b.setKey(projectBranchName)); ComponentDto techProjectBranch = db.components().insertComponent(newProjectCopy(projectBranch, applicationBranch) .setKey(applicationBranch.getKey() + project.getKey()).setMainBranchProjectUuid(application.uuid())); @@ -324,7 +324,7 @@ public class TreeActionIT { @Test public void response_is_empty_on_provisioned_projects() { - ComponentDto project = db.components().insertPrivateProject("project-uuid"); + ComponentDto project = db.components().insertPrivateProject("project-uuid").getMainBranchComponent(); logInWithBrowsePermission(project); TreeWsResponse response = ws.newRequest() @@ -359,7 +359,7 @@ public class TreeActionIT { @Test public void branch() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(UserRole.USER, project); String branchKey = "my_branch"; ComponentDto branch = db.components().insertProjectBranch(project, b -> b.setKey(branchKey)); @@ -382,7 +382,7 @@ public class TreeActionIT { @Test public void dont_show_branch_if_main_branch() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(ComponentTesting.newFileDto(project)); userSession.addProjectPermission(UserRole.USER, project); @@ -397,7 +397,7 @@ public class TreeActionIT { @Test public void pull_request() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(UserRole.USER, project); String pullRequestId = "pr-123"; ComponentDto branch = db.components().insertProjectBranch(project, b -> b.setKey(pullRequestId).setBranchType(PULL_REQUEST)); @@ -419,7 +419,7 @@ public class TreeActionIT { @Test public void fail_when_not_enough_privileges() { - ComponentDto project = db.components().insertPrivateProject("project-uuid"); + ComponentDto project = db.components().insertPrivateProject("project-uuid").getMainBranchComponent(); userSession.logIn() .addProjectPermission(UserRole.CODEVIEWER, project); db.commit(); @@ -512,7 +512,7 @@ public class TreeActionIT { @Test public void fail_if_branch_does_not_exist() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(UserRole.USER, project); db.components().insertProjectBranch(project, b -> b.setKey("my_branch")); @@ -541,7 +541,7 @@ public class TreeActionIT { .setKey("MY_PROJECT_KEY") .setName("Project Name") .setBranchUuid("MY_PROJECT_ID"), - p -> p.setTagsString("abc,def")); + p -> p.setTagsString("abc,def")).getMainBranchComponent(); db.components().insertSnapshot(project); Date now = new Date(); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/developers/ws/SearchEventsActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/developers/ws/SearchEventsActionIT.java index d9aea861aa4..d9196f9955a 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/developers/ws/SearchEventsActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/developers/ws/SearchEventsActionIT.java @@ -107,7 +107,7 @@ public class SearchEventsActionIT { @Test public void json_example() { - ComponentDto project = db.components().insertPrivateProject(p -> p.setName("My Project").setKey(KeyExamples.KEY_PROJECT_EXAMPLE_001)); + ComponentDto project = db.components().insertPrivateProject(p -> p.setName("My Project").setKey(KeyExamples.KEY_PROJECT_EXAMPLE_001)).getMainBranchComponent(); userSession.addProjectPermission(USER, project); SnapshotDto analysis = insertAnalysis(project, 1_500_000_000_000L); EventDto e1 = db.events().insertEvent(newQualityGateEvent(analysis).setName("Failed").setDate(analysis.getCreatedAt())); @@ -126,7 +126,7 @@ public class SearchEventsActionIT { @Test public void events() { when(server.getPublicRootUrl()).thenReturn("https://sonarcloud.io"); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(USER, project); String branchName = randomAlphanumeric(248); ComponentDto branch = db.components().insertProjectBranch(project, b -> b.setKey(branchName)); @@ -156,7 +156,7 @@ public class SearchEventsActionIT { @Test public void does_not_return_old_events() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(USER, project); SnapshotDto analysis = insertAnalysis(project, 1_500_000_000_000L); insertIssue(project, analysis); @@ -190,11 +190,11 @@ public class SearchEventsActionIT { @Test public void does_not_return_events_of_project_for_which_the_current_user_has_no_browse_permission() { - ComponentDto project1 = db.components().insertPrivateProject(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(UserRole.CODEVIEWER, project1); userSession.addProjectPermission(UserRole.ISSUE_ADMIN, project1); - ComponentDto project2 = db.components().insertPrivateProject(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(USER, project2); SnapshotDto a1 = insertAnalysis(project1, 1_500_000_000_000L); @@ -232,7 +232,7 @@ public class SearchEventsActionIT { @Test public void fail_when_not_loggued() { userSession.anonymous(); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); assertThatThrownBy(() -> { ws.newRequest() diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/developers/ws/SearchEventsActionNewIssuesIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/developers/ws/SearchEventsActionNewIssuesIT.java index 148521e4989..1c45e83c3e6 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/developers/ws/SearchEventsActionNewIssuesIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/developers/ws/SearchEventsActionNewIssuesIT.java @@ -85,7 +85,7 @@ public class SearchEventsActionNewIssuesIT { public void issue_event() { userSession.logIn(); when(server.getPublicRootUrl()).thenReturn("https://sonarcloud.io"); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(USER, project); SnapshotDto analysis = insertAnalysis(project, 1_500_000_000_000L); insertIssue(project, analysis); @@ -113,7 +113,7 @@ public class SearchEventsActionNewIssuesIT { public void many_issues_events() { userSession.logIn(); long from = 1_500_000_000_000L; - ComponentDto project = db.components().insertPrivateProject(p -> p.setName("SonarQube")); + ComponentDto project = db.components().insertPrivateProject(p -> p.setName("SonarQube")).getMainBranchComponent(); userSession.addProjectPermission(USER, project); SnapshotDto analysis = insertAnalysis(project, from); insertIssue(project, analysis); @@ -134,7 +134,7 @@ public class SearchEventsActionNewIssuesIT { @Test public void does_not_return_old_issue() { userSession.logIn(); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(USER, project); SnapshotDto analysis = insertAnalysis(project, 1_500_000_000_000L); db.issues().insert(db.rules().insert(), project, project, i -> i.setIssueCreationDate(new Date(analysis.getCreatedAt() - 10_000L))); @@ -151,7 +151,7 @@ public class SearchEventsActionNewIssuesIT { @Test public void return_link_to_issue_search_for_new_issues_event() { userSession.logIn("my_login"); - ComponentDto project = db.components().insertPrivateProject(p -> p.setKey("my_project")); + ComponentDto project = db.components().insertPrivateProject(p -> p.setKey("my_project")).getMainBranchComponent(); userSession.addProjectPermission(USER, project); SnapshotDto analysis = insertAnalysis(project, 1_400_000_000_000L); insertIssue(project, analysis); @@ -171,7 +171,7 @@ public class SearchEventsActionNewIssuesIT { public void branch_issues_events() { userSession.logIn().setSystemAdministrator(); when(server.getPublicRootUrl()).thenReturn("https://sonarcloud.io"); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(USER, project); String branchName1 = "branch1"; ComponentDto branch1 = db.components().insertProjectBranch(project, b -> b.setBranchType(BRANCH).setKey(branchName1)); @@ -207,7 +207,7 @@ public class SearchEventsActionNewIssuesIT { public void pull_request_issues_events() { userSession.logIn().setSystemAdministrator(); when(server.getPublicRootUrl()).thenReturn("https://sonarcloud.io"); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(USER, project); String nonMainBranchName = "nonMain"; ComponentDto nonMainBranch = db.components().insertProjectBranch(project, b -> b.setBranchType(BRANCH).setKey(nonMainBranchName)); @@ -244,7 +244,7 @@ public class SearchEventsActionNewIssuesIT { public void encode_link() { userSession.logIn("rågnar").setSystemAdministrator(); long from = 1_500_000_000_000L; - ComponentDto project = db.components().insertPrivateProject(p -> p.setKey("M&M's")); + ComponentDto project = db.components().insertPrivateProject(p -> p.setKey("M&M's")).getMainBranchComponent(); userSession.addProjectPermission(USER, project); SnapshotDto analysis = insertAnalysis(project, from); insertIssue(project, analysis); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/developers/ws/SearchEventsActionQualityGateIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/developers/ws/SearchEventsActionQualityGateIT.java index aa9181771ac..b44bee08f15 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/developers/ws/SearchEventsActionQualityGateIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/developers/ws/SearchEventsActionQualityGateIT.java @@ -73,7 +73,7 @@ public class SearchEventsActionQualityGateIT { @Test public void quality_gate_events() { when(server.getPublicRootUrl()).thenReturn("https://sonarcloud.io"); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(USER, project); SnapshotDto projectAnalysis = insertSuccessfulActivity(project, 1_500_000_000_000L); db.events().insertEvent(newQualityGateEvent(projectAnalysis).setDate(projectAnalysis.getCreatedAt()).setName("Failed")); @@ -97,7 +97,7 @@ public class SearchEventsActionQualityGateIT { @Test public void branch_quality_gate_events() { when(server.getPublicRootUrl()).thenReturn("https://sonarcloud.io"); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(USER, project); String branchName = randomAlphanumeric(248); ComponentDto branch = db.components().insertProjectBranch(project, b -> b.setBranchType(BRANCH).setKey(branchName)); @@ -124,7 +124,7 @@ public class SearchEventsActionQualityGateIT { public void does_not_return_quality_gate_events_on_pull_request() { userSession.logIn().setSystemAdministrator(); when(server.getPublicRootUrl()).thenReturn("https://sonarcloud.io"); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto pr = db.components().insertProjectBranch(project, b -> b.setBranchType(PULL_REQUEST)); SnapshotDto prAnalysis = insertSuccessfulActivity(pr, 1_500_000_000_000L); insertActivity(project.uuid(), prAnalysis, CeActivityDto.Status.SUCCESS); @@ -140,7 +140,7 @@ public class SearchEventsActionQualityGateIT { @Test public void return_only_latest_quality_gate_event() { - ComponentDto project = db.components().insertPrivateProject(p -> p.setName("My Project")); + ComponentDto project = db.components().insertPrivateProject(p -> p.setName("My Project")).getMainBranchComponent(); userSession.addProjectPermission(USER, project); SnapshotDto a1 = insertSuccessfulActivity(project, 1_500_000_000_000L); EventDto e1 = db.events().insertEvent(newQualityGateEvent(a1).setName("Failed").setDate(a1.getCreatedAt())); @@ -158,7 +158,7 @@ public class SearchEventsActionQualityGateIT { @Test public void return_link_to_dashboard_for_quality_gate_event() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(USER, project); SnapshotDto analysis = insertSuccessfulActivity(project, 1_500_000_000_000L); EventDto e1 = db.events().insertEvent(newQualityGateEvent(analysis).setName("Failed").setDate(analysis.getCreatedAt())); @@ -175,7 +175,7 @@ public class SearchEventsActionQualityGateIT { @Test public void encode_link() { - ComponentDto project = db.components().insertPrivateProject(p -> p.setKey("M&M's")); + ComponentDto project = db.components().insertPrivateProject(p -> p.setKey("M&M's")).getMainBranchComponent(); userSession.addProjectPermission(USER, project); SnapshotDto analysis = insertSuccessfulActivity(project, 1_500_000_000_000L); EventDto event = db.events().insertEvent(newQualityGateEvent(analysis).setName("Failed").setDate(analysis.getCreatedAt())); @@ -192,7 +192,7 @@ public class SearchEventsActionQualityGateIT { @Test public void filter_quality_gate_event() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(USER, project); SnapshotDto analysis = insertSuccessfulActivity(project, 1_500_000_000_000L); EventDto qualityGateEvent = db.events().insertEvent(newQualityGateEvent(analysis).setDate(analysis.getCreatedAt())); @@ -210,11 +210,11 @@ public class SearchEventsActionQualityGateIT { @Test public void filter_by_from_date_inclusive() { - ComponentDto project1 = db.components().insertPrivateProject(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(USER, project1); - ComponentDto project2 = db.components().insertPrivateProject(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(USER, project2); - ComponentDto project3 = db.components().insertPrivateProject(); + ComponentDto project3 = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(USER, project3); long from1 = 1_500_000_000_000L; long from2 = 1_400_000_000_000L; @@ -238,9 +238,9 @@ public class SearchEventsActionQualityGateIT { @Test public void return_one_quality_gate_change_per_project() { - ComponentDto project1 = db.components().insertPrivateProject(p -> p.setName("p1")); + ComponentDto project1 = db.components().insertPrivateProject(p -> p.setName("p1")).getMainBranchComponent(); userSession.addProjectPermission(USER, project1); - ComponentDto project2 = db.components().insertPrivateProject(p -> p.setName("p2")); + ComponentDto project2 = db.components().insertPrivateProject(p -> p.setName("p2")).getMainBranchComponent(); userSession.addProjectPermission(USER, project2); long from = 1_500_000_000_000L; SnapshotDto a11 = insertSuccessfulActivity(project1, from); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/duplication/ws/DuplicationsParserIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/duplication/ws/DuplicationsParserIT.java index d46f5e6bfc3..5e158e3f6d4 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/duplication/ws/DuplicationsParserIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/duplication/ws/DuplicationsParserIT.java @@ -44,7 +44,7 @@ public class DuplicationsParserIT { @Test public void empty_list_when_no_data() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); assertThat(parser.parse(db.getSession(), file, null, null, null)).isEmpty(); @@ -52,7 +52,7 @@ public class DuplicationsParserIT { @Test public void duplication_on_same_file() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); List blocks = parser.parse(db.getSession(), file, null, null, format("\n" + @@ -80,7 +80,7 @@ public class DuplicationsParserIT { @Test public void duplication_on_same_project() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file1 = db.components().insertComponent(newFileDto(project)); ComponentDto file2 = db.components().insertComponent(newFileDto(project)); List blocks = parser.parse(db.getSession(), file1, null, null, @@ -109,10 +109,10 @@ public class DuplicationsParserIT { @Test public void duplications_on_different_project() { - ComponentDto project1 = db.components().insertPrivateProject(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file1 = db.components().insertComponent(newFileDto(project1)); ComponentDto file2 = db.components().insertComponent(newFileDto(project1)); - ComponentDto project2 = db.components().insertPrivateProject(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto fileOnProject2 = db.components().insertComponent(newFileDto(project2)); List blocks = parser.parse(db.getSession(), file1, null, null, format("\n" + @@ -149,11 +149,11 @@ public class DuplicationsParserIT { @Test public void duplications_on_many_blocks() { - ComponentDto project1 = db.components().insertPrivateProject(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file1 = db.components().insertComponent(newFileDto(project1) .setKey("org.codehaus.sonar:sonar-plugin-api:src/main/java/org/sonar/api/utils/command/CommandExecutor.java") .setLongName("CommandExecutor")); - ComponentDto project2 = db.components().insertPrivateProject(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file2 = db.components().insertComponent(newFileDto(project2) .setKey("com.sonarsource.orchestrator:sonar-orchestrator:src/main/java/com/sonar/orchestrator/util/CommandExecutor.java") .setLongName("CommandExecutor")); @@ -181,7 +181,7 @@ public class DuplicationsParserIT { @Test public void duplication_on_not_existing_file() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); List blocks = parser.parse(db.getSession(), file, null, null, format("\n" + @@ -209,8 +209,8 @@ public class DuplicationsParserIT { @Test public void compare_duplications() { - ComponentDto project1 = db.components().insertPrivateProject(); - ComponentDto project2 = db.components().insertPrivateProject(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto currentFile = db.components().insertComponent(newFileDto(project1)); ComponentDto fileOnSameProject = db.components().insertComponent(newFileDto(project1)); ComponentDto fileOnDifferentProject = db.components().insertComponent(newFileDto(project2)); @@ -231,7 +231,7 @@ public class DuplicationsParserIT { assertThat(comparator.compare(Duplication.newComponent(fileOnDifferentProject, 5, 2), Duplication.newComponent(fileOnSameProject, 2, 2))).isOne(); // Files on 2 different projects - ComponentDto project3 = db.components().insertPrivateProject(); + ComponentDto project3 = db.components().insertPrivateProject().getMainBranchComponent(); assertThat(comparator.compare(Duplication.newComponent(fileOnDifferentProject, 5, 2), Duplication.newComponent(project3, 2, 2))).isOne(); @@ -249,7 +249,7 @@ public class DuplicationsParserIT { @Test public void duplication_on_branch() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); String branchName = randomAlphanumeric(248); ComponentDto branch = db.components().insertProjectBranch(project, b -> b.setKey(branchName)); ComponentDto file1 = db.components().insertComponent(newFileDto(branch, project.uuid())); @@ -284,7 +284,7 @@ public class DuplicationsParserIT { @Test public void duplication_on_pull_request() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); String pullRequestKey = RandomStringUtils.randomAlphanumeric(100); ComponentDto pullRequest = db.components().insertProjectBranch(project, b -> b.setBranchType(BranchType.PULL_REQUEST).setKey(pullRequestKey)); ComponentDto file1 = db.components().insertComponent(newFileDto(pullRequest)); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/duplication/ws/ShowActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/duplication/ws/ShowActionIT.java index cfb38f36942..70841845c43 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/duplication/ws/ShowActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/duplication/ws/ShowActionIT.java @@ -89,7 +89,7 @@ public class ShowActionIT { @Test public void return_file_with_missing_duplication_data() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project).setKey("foo.js")); db.components().insertSnapshot(newAnalysis(project)); @@ -105,7 +105,7 @@ public class ShowActionIT { @Test public void duplications_by_file_key_and_branch() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSessionRule.addProjectPermission(UserRole.CODEVIEWER, project); String branchName = randomAlphanumeric(248); ComponentDto branch = db.components().insertProjectBranch(project, b -> b.setKey(branchName)); @@ -159,7 +159,7 @@ public class ShowActionIT { @Test public void duplications_by_file_key_and_pull_request() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSessionRule.addProjectPermission(UserRole.CODEVIEWER, project); String pullRequestKey = randomAlphanumeric(100); ComponentDto pullRequest = db.components().insertProjectBranch(project, b -> b.setBranchType(PULL_REQUEST).setKey(pullRequestKey)); @@ -221,7 +221,7 @@ public class ShowActionIT { @Test public void fail_if_user_is_not_allowed_to_access_project() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); TestRequest request = newBaseRequest().setParam("key", file.getKey()); @@ -243,7 +243,7 @@ public class ShowActionIT { } private void verifyCallToFileWithDuplications(Function requestFactory) { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSessionRule.addProjectPermission(UserRole.CODEVIEWER, project); ComponentDto file = db.components().insertComponent(newFileDto(project).setKey("foo.js")); String xml = "\n" + diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/duplication/ws/ShowResponseBuilderIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/duplication/ws/ShowResponseBuilderIT.java index a6b5ad14f8d..1b3be141672 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/duplication/ws/ShowResponseBuilderIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/duplication/ws/ShowResponseBuilderIT.java @@ -46,7 +46,7 @@ public class ShowResponseBuilderIT { @Test public void write_duplications() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto dir = db.components().insertComponent(newDirectory(project, "path")); ComponentDto file1 = db.components().insertComponent(newFileDto(project, dir)); ComponentDto file2 = db.components().insertComponent(newFileDto(project, dir)); @@ -88,7 +88,7 @@ public class ShowResponseBuilderIT { @Test public void write_duplications_without_sub_project() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file1 = db.components().insertComponent(newFileDto(project)); ComponentDto file2 = db.components().insertComponent(newFileDto(project)); List blocks = newArrayList(); @@ -129,7 +129,7 @@ public class ShowResponseBuilderIT { @Test public void write_duplications_with_a_removed_component() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); List blocks = newArrayList(); blocks.add(new DuplicationsParser.Block(newArrayList( @@ -164,7 +164,7 @@ public class ShowResponseBuilderIT { @Test public void write_duplications_with_a_component_without_details() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); List blocks = newArrayList(); blocks.add(new DuplicationsParser.Block(newArrayList( @@ -203,7 +203,7 @@ public class ShowResponseBuilderIT { @Test public void write_duplications_on_branch() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); String branchName = randomAlphanumeric(248); ComponentDto branch = db.components().insertProjectBranch(project, b -> b.setKey(branchName)); ComponentDto file1 = db.components().insertComponent(newFileDto(branch, project.uuid())); @@ -248,7 +248,7 @@ public class ShowResponseBuilderIT { @Test public void write_duplications_on_pull_request() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); String pullRequestKey = randomAlphanumeric(100); ComponentDto pullRequest = db.components().insertProjectBranch(project, b -> b.setBranchType(PULL_REQUEST).setKey(pullRequestKey)); ComponentDto file1 = db.components().insertComponent(newFileDto(pullRequest)); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/favorite/ws/AddActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/favorite/ws/AddActionIT.java index e9ff78dba00..d7fbca4589f 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/favorite/ws/AddActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/favorite/ws/AddActionIT.java @@ -67,7 +67,7 @@ public class AddActionIT { @Test public void add_a_project() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); UserDto user = db.users().insertUser(); userSession.logIn(user).addProjectPermission(USER, project); @@ -87,7 +87,7 @@ public class AddActionIT { @Test public void fail_when_no_browse_permission_on_the_project() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.logIn().addProjectPermission(UserRole.ADMIN, project); assertThatThrownBy(() -> call(project.getKey())) @@ -104,7 +104,7 @@ public class AddActionIT { @Test public void fail_when_user_is_not_authenticated() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); assertThatThrownBy(() -> call(project.getKey())) .isInstanceOf(UnauthorizedException.class); @@ -112,7 +112,7 @@ public class AddActionIT { @Test public void fail_on_directory() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto directory = db.components().insertComponent(newDirectory(project, "dir")); UserDto user = db.users().insertUser(); userSession.logIn(user).addProjectPermission(USER, project); @@ -124,7 +124,7 @@ public class AddActionIT { @Test public void fail_on_file() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); UserDto user = db.users().insertUser(); userSession.logIn(user).addProjectPermission(USER, project); @@ -136,7 +136,7 @@ public class AddActionIT { @Test public void fail_on_unit_test_file() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto unitTestFile = db.components().insertComponent(newFileDto(project).setQualifier(UNIT_TEST_FILE)); UserDto user = db.users().insertUser(); userSession.logIn(user).addProjectPermission(USER, project); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/favorite/ws/RemoveActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/favorite/ws/RemoveActionIT.java index 092e78523c5..40f5a3f5513 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/favorite/ws/RemoveActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/favorite/ws/RemoveActionIT.java @@ -24,7 +24,6 @@ import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.sonar.api.server.ws.WebService; -import org.sonar.api.web.UserRole; import org.sonar.db.DbClient; import org.sonar.db.DbTester; import org.sonar.db.component.ComponentDto; @@ -117,7 +116,7 @@ public class RemoveActionIT { } private ComponentDto insertProject() { - return db.components().insertPrivateProject(PROJECT_UUID, c -> c.setKey(PROJECT_KEY)); + return db.components().insertPrivateProject(PROJECT_UUID, c -> c.setKey(PROJECT_KEY)).getMainBranchComponent(); } private ComponentDto insertProjectAndPermissions() { diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/hotspot/ws/AddCommentActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/hotspot/ws/AddCommentActionIT.java index fbd93060c44..94a7792e4a4 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/hotspot/ws/AddCommentActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/hotspot/ws/AddCommentActionIT.java @@ -140,7 +140,7 @@ public class AddCommentActionIT { @Test @UseDataProvider("ruleTypesByHotspot") public void fails_with_NotFoundException_if_issue_is_not_a_hotspot(RuleType ruleType) { - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); RuleDto rule = dbTester.rules().insert(t -> t.setType(ruleType)); IssueDto notAHotspot = dbTester.issues().insertIssue(rule, project, file, i -> i.setType(ruleType)); @@ -162,7 +162,7 @@ public class AddCommentActionIT { @Test public void fails_with_NotFoundException_if_hotspot_is_closed() { - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); RuleDto rule = dbTester.rules().insertHotspotRule(); IssueDto hotspot = dbTester.issues().insertHotspot(rule, project, file, t -> t.setStatus(STATUS_CLOSED)); @@ -176,7 +176,7 @@ public class AddCommentActionIT { @Test public void fails_with_ForbiddenException_if_project_is_private_and_not_allowed() { - ComponentDto project = dbTester.components().insertPrivateProject(); + ComponentDto project = dbTester.components().insertPrivateProject().getMainBranchComponent(); userSessionRule.logIn().registerComponents(project); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); RuleDto rule = dbTester.rules().insertHotspotRule(); @@ -191,7 +191,7 @@ public class AddCommentActionIT { @Test public void succeeds_on_public_project() { - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); userSessionRule.logIn().registerComponents(project); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); RuleDto rule = dbTester.rules().insertHotspotRule(); @@ -203,7 +203,7 @@ public class AddCommentActionIT { @Test public void succeeds_on_private_project_with_permission() { - ComponentDto project = dbTester.components().insertPrivateProject(); + ComponentDto project = dbTester.components().insertPrivateProject().getMainBranchComponent(); userSessionRule.logIn().registerComponents(project).addProjectPermission(UserRole.USER, project); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); RuleDto rule = dbTester.rules().insertHotspotRule(); @@ -218,7 +218,7 @@ public class AddCommentActionIT { public void persists_comment_if_hotspot_status_changes_and_transition_done(String currentStatus, @Nullable String currentResolution) { long now = RANDOM.nextInt(232_323); when(system2.now()).thenReturn(now); - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); userSessionRule.logIn().registerComponents(project); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); RuleDto rule = dbTester.rules().insertHotspotRule(); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/hotspot/ws/AssignActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/hotspot/ws/AssignActionIT.java index 9ec4eb81015..019bda572a7 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/hotspot/ws/AssignActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/hotspot/ws/AssignActionIT.java @@ -121,7 +121,7 @@ public class AssignActionIT { @Test public void assign_hotspot_to_someone_for_public_project() { - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); IssueDto hotspot = dbTester.issues().insertHotspot(project, file); @@ -138,7 +138,7 @@ public class AssignActionIT { @Test public void unassign_hotspot_for_public_project() { - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); UserDto assignee = insertUser(randomAlphanumeric(15)); @@ -155,7 +155,7 @@ public class AssignActionIT { @Test public void assign_hotspot_to_me_for_public_project() { - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); IssueDto hotspot = dbTester.issues().insertHotspot(project, file); @@ -171,7 +171,7 @@ public class AssignActionIT { @Test public void unassign_hotspot_myself_for_public_project() { - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); UserDto me = insertUser(randomAlphanumeric(10)); userSessionRule.logIn(me).registerComponents(project); @@ -186,7 +186,7 @@ public class AssignActionIT { @Test public void assign_hotspot_to_someone_for_private_project() { - ComponentDto project = dbTester.components().insertPrivateProject(); + ComponentDto project = dbTester.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); IssueDto hotspot = dbTester.issues().insertHotspot(project, file); @@ -202,7 +202,7 @@ public class AssignActionIT { @Test public void unassign_hotspot_for_private_project() { - ComponentDto project = dbTester.components().insertPrivateProject(); + ComponentDto project = dbTester.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); UserDto assignee = insertUser(randomAlphanumeric(15)); IssueDto hotspot = dbTester.issues().insertHotspot(project, file, h -> h.setAssigneeUuid(assignee.getUuid())); @@ -218,7 +218,7 @@ public class AssignActionIT { @Test public void assign_hotspot_to_someone_for_private_project_branch() { - ComponentDto project = dbTester.components().insertPrivateProject(); + ComponentDto project = dbTester.components().insertPrivateProject().getMainBranchComponent(); ComponentDto branch = dbTester.components().insertProjectBranch(project); ComponentDto file = dbTester.components().insertComponent(newFileDto(branch, project.uuid())); IssueDto hotspot = dbTester.issues().insertHotspot(branch, file); @@ -236,7 +236,7 @@ public class AssignActionIT { @Test public void fail_if_assignee_does_not_have_access_for_private_project() { - ComponentDto project = dbTester.components().insertPrivateProject(); + ComponentDto project = dbTester.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); IssueDto hotspot = dbTester.issues().insertHotspot(project, file); @@ -253,7 +253,7 @@ public class AssignActionIT { @Test public void fail_if_assignee_does_not_have_access_for_private_project_branch() { - ComponentDto project = dbTester.components().insertPrivateProject(); + ComponentDto project = dbTester.components().insertPrivateProject().getMainBranchComponent(); ComponentDto branch = dbTester.components().insertProjectBranch(project); ComponentDto file = dbTester.components().insertComponent(newFileDto(branch, project.uuid())); IssueDto hotspot = dbTester.issues().insertHotspot(branch, file); @@ -272,7 +272,7 @@ public class AssignActionIT { @Test public void assign_hotspot_to_me_for_private_project() { - ComponentDto project = dbTester.components().insertPrivateProject(); + ComponentDto project = dbTester.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); IssueDto hotspot = dbTester.issues().insertHotspot(project, file); @@ -288,7 +288,7 @@ public class AssignActionIT { @Test public void assign_hotspot_with_comment() { - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); IssueDto hotspot = dbTester.issues().insertHotspot(project, file); @@ -308,7 +308,7 @@ public class AssignActionIT { @Test public void assign_twice_same_user_to_hotspot_does_not_reload() { - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); IssueDto hotspot = dbTester.issues().insertHotspot(project, file); @@ -327,7 +327,7 @@ public class AssignActionIT { @Test public void fail_if_assigning_to_not_existing_user() { - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); IssueDto hotspot = dbTester.issues().insertHotspot(project, file); @@ -344,7 +344,7 @@ public class AssignActionIT { @Test @UseDataProvider("allIssueStatusesAndResolutionsThatThrowOnAssign") public void fail_if_assign_user_to_hotspot_for_which_it_is_forbidden(String status, String resolution) { - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); IssueDto hotspot = dbTester.issues().insertHotspot(project, file, h -> { @@ -374,7 +374,7 @@ public class AssignActionIT { @Test @UseDataProvider("allIssueStatusesAndResolutionsThatDoNotThrowOnAssign") public void fail_if_assign_user_to_hotspot_for_which_it_is_allowed(String status, String resolution) { - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); IssueDto hotspot = dbTester.issues().insertHotspot(project, file, h -> { h.setStatus(status); @@ -398,7 +398,7 @@ public class AssignActionIT { @Test public void fail_if_not_authenticated() { - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); IssueDto hotspot = dbTester.issues().insertHotspot(project, file); @@ -414,7 +414,7 @@ public class AssignActionIT { @Test public void fail_if_missing_browse_permission() { - ComponentDto project = dbTester.components().insertPrivateProject(); + ComponentDto project = dbTester.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); IssueDto hotspot = dbTester.issues().insertHotspot(project, file); @@ -430,7 +430,7 @@ public class AssignActionIT { @Test public void fail_if_hotspot_does_not_exist() { - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); UserDto me = insertUser(randomAlphanumeric(10)); userSessionRule.logIn().registerComponents(project); @@ -445,7 +445,7 @@ public class AssignActionIT { @Test @UseDataProvider("allRuleTypesWithStatusesExceptHotspot") public void fail_if_trying_to_assign_issue(RuleType ruleType, String status) { - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); RuleDto rule = newRule(ruleType); IssueDto issue = dbTester.issues().insertIssue(rule, project, file, i -> i @@ -479,7 +479,7 @@ public class AssignActionIT { @Test public void fail_with_NotFoundException_if_hotspot_is_closed() { - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); RuleDto rule = newRule(SECURITY_HOTSPOT); IssueDto issue = dbTester.issues().insertHotspot(rule, project, file, t -> t.setStatus(STATUS_CLOSED)); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/hotspot/ws/ChangeStatusActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/hotspot/ws/ChangeStatusActionIT.java index 826d50e49e0..9249030980e 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/hotspot/ws/ChangeStatusActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/hotspot/ws/ChangeStatusActionIT.java @@ -241,7 +241,7 @@ public class ChangeStatusActionIT { @Test @UseDataProvider("validStatusAndResolutions") public void fails_with_NotFoundException_if_hotspot_is_closed(String status, @Nullable String resolution) { - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); RuleDto rule = newRule(SECURITY_HOTSPOT); IssueDto closedHotspot = dbTester.issues().insertHotspot(rule, project, file, t -> t.setStatus(STATUS_CLOSED)); @@ -271,7 +271,7 @@ public class ChangeStatusActionIT { @Test @UseDataProvider("ruleTypesButHotspot") public void fails_with_NotFoundException_if_issue_is_not_a_hotspot(String status, @Nullable String resolution, RuleType ruleType) { - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); RuleDto rule = newRule(ruleType); IssueDto notAHotspot = dbTester.issues().insert(IssueTesting.newIssue(rule, project, file).setType(ruleType)); @@ -294,7 +294,7 @@ public class ChangeStatusActionIT { @Test @UseDataProvider("anyPublicProjectPermissionButHotspotAdmin") public void fails_with_ForbiddenException_if_project_is_public_and_user_has_no_HotspotAdmin_permission_on_it(String permission) { - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); userSessionRule.logIn().registerComponents(project) .addProjectPermission(permission, project); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); @@ -324,7 +324,7 @@ public class ChangeStatusActionIT { @Test @UseDataProvider("anyPrivateProjectPermissionButHotspotAdmin") public void fails_with_ForbiddenException_if_project_is_private_and_has_no_IssueAdmin_permission_on_it(String permission) { - ComponentDto project = dbTester.components().insertPrivateProject(); + ComponentDto project = dbTester.components().insertPrivateProject().getMainBranchComponent(); userSessionRule.logIn().registerComponents(project) .addProjectPermission(permission, project); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); @@ -356,7 +356,7 @@ public class ChangeStatusActionIT { @Test @UseDataProvider("validStatusAndResolutions") public void succeeds_on_public_project_with_HotspotAdmin_permission(String status, @Nullable String resolution) { - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); userSessionRule.logIn().registerComponents(project) .addProjectPermission(UserRole.SECURITYHOTSPOT_ADMIN, project); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); @@ -368,7 +368,7 @@ public class ChangeStatusActionIT { @Test @UseDataProvider("validStatusAndResolutions") public void succeeds_on_private_project_with_HotspotAdmin_permission(String status, @Nullable String resolution) { - ComponentDto project = dbTester.components().insertPrivateProject(); + ComponentDto project = dbTester.components().insertPrivateProject().getMainBranchComponent(); userSessionRule.logIn().registerComponents(project) .addProjectPermission(UserRole.SECURITYHOTSPOT_ADMIN, project); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); @@ -380,7 +380,7 @@ public class ChangeStatusActionIT { @Test @UseDataProvider("validStatusAndResolutions") public void no_effect_and_success_if_hotspot_already_has_specified_status_and_resolution(String status, @Nullable String resolution) { - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); userSessionRule.logIn().registerComponents(project) .addProjectPermission(UserRole.SECURITYHOTSPOT_ADMIN, project); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); @@ -396,7 +396,7 @@ public class ChangeStatusActionIT { public void success_to_change_hostpot_to_review_into_reviewed_status(String resolution, String expectedTransitionKey, boolean transitionDone) { long now = RANDOM.nextInt(232_323); when(system2.now()).thenReturn(now); - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); userSessionRule.logIn().registerComponents(project) .addProjectPermission(UserRole.SECURITYHOTSPOT_ADMIN, project); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); @@ -443,7 +443,7 @@ public class ChangeStatusActionIT { public void success_to_change_reviewed_hotspot_back_to_to_review(String resolution, boolean transitionDone) { long now = RANDOM.nextInt(232_323); when(system2.now()).thenReturn(now); - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); userSessionRule.logIn().registerComponents(project) .addProjectPermission(UserRole.SECURITYHOTSPOT_ADMIN, project); @@ -492,7 +492,7 @@ public class ChangeStatusActionIT { String newStatus, @Nullable String newResolution, boolean transitionDone) { long now = RANDOM.nextInt(232_323); when(system2.now()).thenReturn(now); - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); userSessionRule.logIn().registerComponents(project) .addProjectPermission(UserRole.SECURITYHOTSPOT_ADMIN, project); @@ -549,7 +549,7 @@ public class ChangeStatusActionIT { public void do_not_persist_comment_if_no_status_change(String status, @Nullable String resolution) { long now = RANDOM.nextInt(232_323); when(system2.now()).thenReturn(now); - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); userSessionRule.logIn().registerComponents(project) .addProjectPermission(UserRole.SECURITYHOTSPOT_ADMIN, project); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/hotspot/ws/DeleteCommentActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/hotspot/ws/DeleteCommentActionIT.java index 4d9b1b37607..8d6165bb7c8 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/hotspot/ws/DeleteCommentActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/hotspot/ws/DeleteCommentActionIT.java @@ -71,7 +71,7 @@ public class DeleteCommentActionIT { public void delete_comment_from_hotspot_private_project() { UserDto userDeletingOwnComment = dbTester.users().insertUser(); - ComponentDto project = dbTester.components().insertPrivateProject(); + ComponentDto project = dbTester.components().insertPrivateProject().getMainBranchComponent(); IssueDto hotspot = dbTester.issues().insertHotspot(h -> h.setProject(project)); IssueChangeDto comment = dbTester.issues().insertComment(hotspot, userDeletingOwnComment, "Some comment"); @@ -91,7 +91,7 @@ public class DeleteCommentActionIT { public void delete_comment_from_hotspot_public_project() { UserDto userAddingComment = dbTester.users().insertUser(); - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); IssueDto hotspot = dbTester.issues().insertHotspot(h -> h.setProject(project)); IssueChangeDto comment = dbTester.issues().insertComment(hotspot, userAddingComment, "Some comment"); @@ -137,7 +137,7 @@ public class DeleteCommentActionIT { UserDto userTryingToDelete = dbTester.users().insertUser(); UserDto userWithHotspotComment = dbTester.users().insertUser(); - ComponentDto project = dbTester.components().insertPrivateProject(); + ComponentDto project = dbTester.components().insertPrivateProject().getMainBranchComponent(); IssueDto hotspot = dbTester.issues().insertHotspot(h -> h.setProject(project)); IssueChangeDto comment = dbTester.issues().insertComment(hotspot, userWithHotspotComment, "Some comment"); @@ -157,7 +157,7 @@ public class DeleteCommentActionIT { UserDto userTryingToDelete = dbTester.users().insertUser(); UserDto userWithHotspotComment = dbTester.users().insertUser(); - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); IssueDto hotspot = dbTester.issues().insertHotspot(h -> h.setProject(project)); IssueChangeDto comment = dbTester.issues().insertComment(hotspot, userWithHotspotComment, "Some comment"); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/hotspot/ws/EditCommentActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/hotspot/ws/EditCommentActionIT.java index ba825044632..897596f58de 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/hotspot/ws/EditCommentActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/hotspot/ws/EditCommentActionIT.java @@ -76,7 +76,7 @@ public class EditCommentActionIT { public void edit_comment_from_hotspot_private_project() { UserDto userEditingOwnComment = dbTester.users().insertUser(); - ComponentDto project = dbTester.components().insertPrivateProject(); + ComponentDto project = dbTester.components().insertPrivateProject().getMainBranchComponent(); IssueDto hotspot = dbTester.issues().insertHotspot(h -> h.setProject(project)); IssueChangeDto comment = dbTester.issues().insertComment(hotspot, userEditingOwnComment, "Some comment"); @@ -100,7 +100,7 @@ public class EditCommentActionIT { public void edit_comment_from_hotspot_public_project() { UserDto userEditingComment = dbTester.users().insertUser(); - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); IssueDto hotspot = dbTester.issues().insertHotspot(h -> h.setProject(project)); IssueChangeDto comment = dbTester.issues().insertComment(hotspot, userEditingComment, "Some comment"); @@ -144,7 +144,7 @@ public class EditCommentActionIT { UserDto userTryingToDelete = dbTester.users().insertUser(); UserDto userWithHotspotComment = dbTester.users().insertUser(); - ComponentDto project = dbTester.components().insertPrivateProject(); + ComponentDto project = dbTester.components().insertPrivateProject().getMainBranchComponent(); IssueDto hotspot = dbTester.issues().insertHotspot(h -> h.setProject(project)); IssueChangeDto comment = dbTester.issues().insertComment(hotspot, userWithHotspotComment, "Some comment"); @@ -164,7 +164,7 @@ public class EditCommentActionIT { UserDto userTryingToEdit = dbTester.users().insertUser(); UserDto userWithHotspotComment = dbTester.users().insertUser(); - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); IssueDto hotspot = dbTester.issues().insertHotspot(h -> h.setProject(project)); IssueChangeDto comment = dbTester.issues().insertComment(hotspot, userWithHotspotComment, "Some comment"); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/hotspot/ws/SearchActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/hotspot/ws/SearchActionIT.java index 96933397589..a5255b25d88 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/hotspot/ws/SearchActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/hotspot/ws/SearchActionIT.java @@ -342,7 +342,7 @@ public class SearchActionIT { @Test public void fails_with_NotFoundException_if_project_is_neither_a_project_nor_an_application() { - ComponentDto project = dbTester.components().insertPrivateProject(); + ComponentDto project = dbTester.components().insertPrivateProject().getMainBranchComponent(); ComponentDto directory = dbTester.components().insertComponent(ComponentTesting.newDirectory(project, "foo")); ComponentDto file = dbTester.components().insertComponent(ComponentTesting.newFileDto(project)); ComponentDto portfolio = dbTester.components().insertPrivatePortfolio(); @@ -359,7 +359,7 @@ public class SearchActionIT { @Test public void fails_with_ForbiddenException_if_project_is_private_and_not_allowed() { - ComponentDto project = dbTester.components().insertPrivateProject(); + ComponentDto project = dbTester.components().insertPrivateProject().getMainBranchComponent(); userSessionRule.registerComponents(project); TestRequest request = newRequest(project); @@ -370,7 +370,7 @@ public class SearchActionIT { @Test public void fails_with_ForbiddenException_if_application_is_private_and_not_allowed() { - ComponentDto application = dbTester.components().insertPrivateApplication(); + ComponentDto application = dbTester.components().insertPrivateApplication().getMainBranchComponent(); userSessionRule.registerComponents(application); TestRequest request = newRequest(application); @@ -381,7 +381,7 @@ public class SearchActionIT { @Test public void succeeds_on_public_project() { - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); userSessionRule.registerComponents(project); SearchWsResponse response = newRequest(project) @@ -393,7 +393,7 @@ public class SearchActionIT { @Test public void succeeds_on_public_application() { - ComponentDto application = dbTester.components().insertPublicApplication(); + ComponentDto application = dbTester.components().insertPublicApplication().getMainBranchComponent(); userSessionRule.registerApplication(application); SearchWsResponse response = newRequest(application) @@ -405,7 +405,7 @@ public class SearchActionIT { @Test public void succeeds_on_private_project_with_permission() { - ComponentDto project = dbTester.components().insertPrivateProject(); + ComponentDto project = dbTester.components().insertPrivateProject().getMainBranchComponent(); userSessionRule.registerComponents(project); userSessionRule.logIn().addProjectPermission(USER, project); @@ -418,7 +418,7 @@ public class SearchActionIT { @Test public void succeeds_on_private_application_with_permission() { - ComponentDto application = dbTester.components().insertPrivateApplication(); + ComponentDto application = dbTester.components().insertPrivateApplication().getMainBranchComponent(); userSessionRule.logIn().registerApplication(application).addProjectPermission(USER, application); SearchWsResponse response = newRequest(application) @@ -430,7 +430,7 @@ public class SearchActionIT { @Test public void does_not_fail_if_rule_of_hotspot_does_not_exist_in_DB() { - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); userSessionRule.registerComponents(project); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); indexPermissions(); @@ -457,7 +457,7 @@ public class SearchActionIT { @Test public void returns_no_hotspot_component_nor_rule_when_project_has_no_hotspot() { - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); userSessionRule.registerComponents(project); indexPermissions(); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); @@ -477,7 +477,7 @@ public class SearchActionIT { @Test public void returns_hotspot_components_when_project_has_hotspots() { - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); userSessionRule.registerComponents(project); indexPermissions(); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); @@ -509,7 +509,7 @@ public class SearchActionIT { @Test public void returns_single_component_when_all_hotspots_are_on_project() { - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); userSessionRule.registerComponents(project); indexPermissions(); IssueDto[] hotspots = IntStream.range(0, 1 + RANDOM.nextInt(10)) @@ -533,8 +533,8 @@ public class SearchActionIT { @Test public void returns_hotspots_of_specified_project() { - ComponentDto project1 = dbTester.components().insertPublicProject(); - ComponentDto project2 = dbTester.components().insertPublicProject(); + ComponentDto project1 = dbTester.components().insertPublicProject().getMainBranchComponent(); + ComponentDto project2 = dbTester.components().insertPublicProject().getMainBranchComponent(); userSessionRule.registerComponents(project1, project2); indexPermissions(); ComponentDto file1 = dbTester.components().insertComponent(newFileDto(project1)); @@ -571,7 +571,7 @@ public class SearchActionIT { @Test public void returns_only_hotspots_to_review_or_reviewed_of_project() { - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); userSessionRule.registerComponents(project); indexPermissions(); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); @@ -597,10 +597,10 @@ public class SearchActionIT { @Test public void returns_hotspots_of_specified_application() { - ComponentDto application1 = dbTester.components().insertPublicApplication(); - ComponentDto application2 = dbTester.components().insertPublicApplication(); - ComponentDto project1 = dbTester.components().insertPublicProject(); - ComponentDto project2 = dbTester.components().insertPublicProject(); + ComponentDto application1 = dbTester.components().insertPublicApplication().getMainBranchComponent(); + ComponentDto application2 = dbTester.components().insertPublicApplication().getMainBranchComponent(); + ComponentDto project1 = dbTester.components().insertPublicProject().getMainBranchComponent(); + ComponentDto project2 = dbTester.components().insertPublicProject().getMainBranchComponent(); dbTester.components().insertComponent(ComponentTesting.newProjectCopy(project1, application1)); dbTester.components().insertComponent(ComponentTesting.newProjectCopy(project2, application2)); indexViews(); @@ -641,10 +641,10 @@ public class SearchActionIT { @Test public void returns_hotspots_of_specified_application_branch() { - ComponentDto application = dbTester.components().insertPublicApplication(); + ComponentDto application = dbTester.components().insertPublicApplication().getMainBranchComponent(); ComponentDto applicationBranch = dbTester.components().insertProjectBranch(application, b -> b.setKey("appBranch")); - ComponentDto project1 = dbTester.components().insertPublicProject(); - ComponentDto project2 = dbTester.components().insertPublicProject(); + ComponentDto project1 = dbTester.components().insertPublicProject().getMainBranchComponent(); + ComponentDto project2 = dbTester.components().insertPublicProject().getMainBranchComponent(); dbTester.components().insertComponent(ComponentTesting.newProjectCopy(project1, application)); dbTester.components().insertComponent(ComponentTesting.newProjectCopy(project2, applicationBranch)); indexViews(); @@ -685,7 +685,7 @@ public class SearchActionIT { @Test public void returns_hotspot_of_branch_or_pullRequest() { - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); userSessionRule.registerComponents(project); indexPermissions(); ComponentDto branch = dbTester.components().insertProjectBranch(project, b -> b.setKey("branch")); @@ -736,7 +736,7 @@ public class SearchActionIT { @Test @UseDataProvider("onlyMineParamValues") public void returns_hotspots_of_specified_project_assigned_to_current_user_if_only_mine_is_set(String onlyMineParameter, boolean shouldFilter) { - ComponentDto project1 = dbTester.components().insertPublicProject(); + ComponentDto project1 = dbTester.components().insertPublicProject().getMainBranchComponent(); String assigneeUuid = this.userSessionRule.logIn().registerComponents(project1).getUuid(); indexPermissions(); @@ -785,7 +785,7 @@ public class SearchActionIT { @Test public void fail_if_hotspots_provided_with_onlyMine_param() { - ComponentDto project = dbTester.components().insertPrivateProject(); + ComponentDto project = dbTester.components().insertPrivateProject().getMainBranchComponent(); userSessionRule.registerComponents(project); userSessionRule.logIn().addProjectPermission(USER, project); @@ -800,7 +800,7 @@ public class SearchActionIT { @Test public void fail_if_user_not_authenticated_with_onlyMine_param() { - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); userSessionRule.anonymous(); @@ -814,7 +814,7 @@ public class SearchActionIT { @Test public void returns_hotpots_with_any_status_if_no_status_nor_resolution_parameter() { - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); userSessionRule.registerComponents(project); indexPermissions(); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); @@ -832,7 +832,7 @@ public class SearchActionIT { @Test public void returns_hotpots_reviewed_as_safe_and_fixed_if_status_is_REVIEWED_and_resolution_is_not_set() { - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); userSessionRule.registerComponents(project); indexPermissions(); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); @@ -851,7 +851,7 @@ public class SearchActionIT { @Test public void returns_hotpots_reviewed_as_safe_if_status_is_REVIEWED_and_resolution_is_SAFE() { - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); userSessionRule.registerComponents(project); indexPermissions(); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); @@ -870,7 +870,7 @@ public class SearchActionIT { @Test public void returns_hotpots_reviewed_as_fixed_if_status_is_REVIEWED_and_resolution_is_FIXED() { - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); userSessionRule.registerComponents(project); indexPermissions(); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); @@ -889,7 +889,7 @@ public class SearchActionIT { @Test public void returns_only_unresolved_hotspots_when_status_is_TO_REVIEW() { - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); userSessionRule.registerComponents(project); indexPermissions(); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); @@ -931,7 +931,7 @@ public class SearchActionIT { @Test @UseDataProvider("validStatusesAndResolutions") public void returns_fields_of_hotspot(String status, @Nullable String resolution) { - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); userSessionRule.registerComponents(project); indexPermissions(); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); @@ -980,7 +980,7 @@ public class SearchActionIT { @Test @UseDataProvider("allSQCategories") public void returns_SQCategory_and_VulnerabilityProbability_of_rule(Set securityStandards, SQCategory expected) { - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); userSessionRule.registerComponents(project); indexPermissions(); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); @@ -1013,7 +1013,7 @@ public class SearchActionIT { @Test public void does_not_fail_when_hotspot_has_none_of_the_nullable_fields() { - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); userSessionRule.registerComponents(project); indexPermissions(); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); @@ -1041,7 +1041,7 @@ public class SearchActionIT { @Test public void returns_details_of_components() { - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); userSessionRule.registerComponents(project); indexPermissions(); ComponentDto directory = dbTester.components().insertComponent(newDirectory(project, "donut/acme")); @@ -1090,7 +1090,7 @@ public class SearchActionIT { @Test public void returns_branch_field_of_components_of_branch() { - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); String branchName = randomAlphanumeric(248); ComponentDto branch = dbTester.components().insertProjectBranch(project, b -> b.setKey(branchName)); userSessionRule.registerComponents(project, branch); @@ -1126,7 +1126,7 @@ public class SearchActionIT { @Test public void returns_pullRequest_field_of_components_of_pullRequest() { - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); String pullRequestKey = randomAlphanumeric(100); ComponentDto pullRequest = dbTester.components().insertProjectBranch(project, t -> t.setBranchType(BranchType.PULL_REQUEST) .setKey(pullRequestKey)); @@ -1163,7 +1163,7 @@ public class SearchActionIT { @Test public void returns_hotspots_ordered_by_vulnerabilityProbability_score_then_rule_uuid() { - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); userSessionRule.registerComponents(project); indexPermissions(); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); @@ -1200,7 +1200,7 @@ public class SearchActionIT { @Test public void returns_hotspots_ordered_by_file_path_then_line_then_key() { - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); userSessionRule.registerComponents(project); indexPermissions(); ComponentDto file1 = dbTester.components().insertComponent(newFileDto(project).setPath("b/c/a")); @@ -1233,7 +1233,7 @@ public class SearchActionIT { @Test public void returns_hotspot_with_secondary_locations() { - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); userSessionRule.registerComponents(project); indexPermissions(); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); @@ -1278,7 +1278,7 @@ public class SearchActionIT { @Test public void returns_first_page_with_100_results_by_default() { - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); userSessionRule.registerComponents(project); indexPermissions(); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); @@ -1303,7 +1303,7 @@ public class SearchActionIT { @Test public void returns_specified_page_with_100_results_by_default() { - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); userSessionRule.registerComponents(project); indexPermissions(); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); @@ -1314,7 +1314,7 @@ public class SearchActionIT { @Test public void returns_specified_page_with_specified_number_of_results() { - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); userSessionRule.registerComponents(project); indexPermissions(); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); @@ -1371,7 +1371,7 @@ public class SearchActionIT { @Test public void returns_empty_if_none_of_hotspot_keys_exist() { - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); userSessionRule.registerComponents(project); indexPermissions(); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); @@ -1390,7 +1390,7 @@ public class SearchActionIT { @Test public void returns_specified_hotspots() { - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); userSessionRule.registerComponents(project); indexPermissions(); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); @@ -1413,7 +1413,7 @@ public class SearchActionIT { @Test public void returns_hotspots_with_specified_sonarsourceSecurity_category() { - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); userSessionRule.registerComponents(project); indexPermissions(); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); @@ -1435,7 +1435,7 @@ public class SearchActionIT { @Test public void returns_hotspots_with_specified_cwes() { - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); userSessionRule.registerComponents(project); indexPermissions(); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); @@ -1457,7 +1457,7 @@ public class SearchActionIT { @Test public void returns_hotspots_with_specified_owaspTop10_category() { - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); userSessionRule.registerComponents(project); indexPermissions(); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); @@ -1479,7 +1479,7 @@ public class SearchActionIT { @Test public void returns_hotspots_with_specified_pciDss_category() { - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); userSessionRule.registerComponents(project); indexPermissions(); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); @@ -1510,7 +1510,7 @@ public class SearchActionIT { @Test public void returns_hotspots_with_specified_owaspAsvs_category() { - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); userSessionRule.registerComponents(project); indexPermissions(); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); @@ -1541,7 +1541,7 @@ public class SearchActionIT { @Test public void returns_hotspots_with_specified_owaspAsvs_level() { - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); userSessionRule.registerComponents(project); indexPermissions(); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); @@ -1596,7 +1596,7 @@ public class SearchActionIT { @Test public void returns_hotspots_with_specified_owasp2021Top10_category() { - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); userSessionRule.registerComponents(project); indexPermissions(); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); @@ -1618,7 +1618,7 @@ public class SearchActionIT { @Test public void returns_hotspots_with_specified_sansTop25_category() { - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); userSessionRule.registerComponents(project); indexPermissions(); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); @@ -1640,7 +1640,7 @@ public class SearchActionIT { @Test public void returns_hotspots_with_specified_files() { - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); userSessionRule.registerComponents(project); indexPermissions(); ComponentDto file1 = dbTester.components().insertComponent(newFileDto(project)); @@ -1662,7 +1662,7 @@ public class SearchActionIT { @Test public void returns_hotspots_on_the_leak_period_when_inNewCodePeriod_is_true() { - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); userSessionRule.registerComponents(project); indexPermissions(); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); @@ -1717,7 +1717,7 @@ public class SearchActionIT { @Test public void returns_hotspots_on_the_leak_period_when_inNewCodePeriod_is_true_and_branch_uses_reference_branch() { - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); userSessionRule.registerComponents(project); indexPermissions(); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); @@ -1761,7 +1761,7 @@ public class SearchActionIT { long referenceDate = 800_996_999_332L; system2.setNow(referenceDate + 10_000); - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); userSessionRule.registerComponents(project); indexPermissions(); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); @@ -1792,7 +1792,7 @@ public class SearchActionIT { long referenceDate = 800_996_999_332L; system2.setNow(referenceDate + 10_000); - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); ComponentDto pr = dbTester.components().insertProjectBranch(project, b -> b.setBranchType(BranchType.PULL_REQUEST).setKey("pr")); userSessionRule.registerComponents(project); indexPermissions(); @@ -1824,9 +1824,9 @@ public class SearchActionIT { long referenceDate = 800_996_999_332L; system2.setNow(referenceDate + 10_000); - ComponentDto application = dbTester.components().insertPublicApplication(); - ComponentDto project = dbTester.components().insertPublicProject(); - ComponentDto project2 = dbTester.components().insertPublicProject(); + ComponentDto application = dbTester.components().insertPublicApplication().getMainBranchComponent(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); + ComponentDto project2 = dbTester.components().insertPublicProject().getMainBranchComponent(); dbTester.components().addApplicationProject(application, project); dbTester.components().addApplicationProject(application, project2); @@ -1869,12 +1869,12 @@ public class SearchActionIT { long referenceDate = 800_996_999_332L; system2.setNow(referenceDate + 10_000); - ProjectDto application = dbTester.components().insertPublicApplicationDto(); + ProjectDto application = dbTester.components().insertPublicApplication().getProjectDto(); BranchDto applicationBranch = dbTester.components().insertProjectBranch(application, branchDto -> branchDto.setKey("application_branch_1")); - ProjectDto project = dbTester.components().insertPublicProjectDto(); + ProjectDto project = dbTester.components().insertPublicProject().getProjectDto(); BranchDto projectBranch = dbTester.components().insertProjectBranch(project, branchDto -> branchDto.setKey("project_1_branch_1")); - ProjectDto project2 = dbTester.components().insertPublicProjectDto(); + ProjectDto project2 = dbTester.components().insertPublicProject().getProjectDto(); BranchDto project2Branch = dbTester.components().insertProjectBranch(project2, branchDto -> branchDto.setKey("project_2_branch_1")); dbTester.components().addApplicationProject(application, project); @@ -1928,7 +1928,7 @@ public class SearchActionIT { ComponentDto project = dbTester.components().insertPublicProject(componentDto -> componentDto .setName("test-project") .setLongName("test-project") - .setKey("com.sonarsource:test-project")); + .setKey("com.sonarsource:test-project")).getMainBranchComponent(); userSessionRule.registerComponents(project); indexPermissions(); ComponentDto fileWithHotspot = dbTester.components().insertComponent(newFileDto(project) @@ -1963,7 +1963,7 @@ public class SearchActionIT { @Test public void returns_hotspots_with_ruleKey() { - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); userSessionRule.registerComponents(project); indexPermissions(); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/hotspot/ws/ShowActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/hotspot/ws/ShowActionIT.java index 2ea85ddda2d..e3784bc6339 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/hotspot/ws/ShowActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/hotspot/ws/ShowActionIT.java @@ -158,7 +158,7 @@ public class ShowActionIT { @Test @UseDataProvider("ruleTypesButHotspot") public void fails_with_NotFoundException_if_issue_is_not_a_hotspot(RuleType ruleType) { - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); RuleDto rule = newRule(ruleType); IssueDto notAHotspot = dbTester.issues().insertIssue(rule, project, file, i -> i.setType(ruleType)); @@ -179,7 +179,7 @@ public class ShowActionIT { @Test public void fails_with_NotFoundException_if_issue_is_hotspot_is_closed() { - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); RuleDto rule = newRule(SECURITY_HOTSPOT); IssueDto hotspot = dbTester.issues().insertHotspot(rule, project, file, t -> t.setStatus(Issue.STATUS_CLOSED)); @@ -192,7 +192,7 @@ public class ShowActionIT { @Test public void fails_with_ForbiddenException_if_project_is_private_and_not_allowed() { - ComponentDto project = dbTester.components().insertPrivateProject(); + ComponentDto project = dbTester.components().insertPrivateProject().getMainBranchComponent(); userSessionRule.registerComponents(project); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); RuleDto rule = newRule(SECURITY_HOTSPOT); @@ -206,7 +206,7 @@ public class ShowActionIT { @Test public void succeeds_on_hotspot_with_flow() { - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); ComponentDto anotherFile = dbTester.components().insertComponent(newFileDto(project)); DbIssues.Locations.Builder locations = DbIssues.Locations.newBuilder() @@ -265,7 +265,7 @@ public class ShowActionIT { @Test public void succeeds_on_public_project() { - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); userSessionRule.registerComponents(project); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); RuleDto rule = newRule(SECURITY_HOTSPOT); @@ -280,7 +280,7 @@ public class ShowActionIT { @Test public void succeeds_on_private_project_with_permission() { - ComponentDto project = dbTester.components().insertPrivateProject(); + ComponentDto project = dbTester.components().insertPrivateProject().getMainBranchComponent(); userSessionRule.registerComponents(project); userSessionRule.logIn().addProjectPermission(UserRole.USER, project); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); @@ -296,7 +296,7 @@ public class ShowActionIT { @Test public void return_canChangeStatus_false_on_public_project_when_anonymous() { - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); userSessionRule.registerComponents(project); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); RuleDto rule = newRule(SECURITY_HOTSPOT); @@ -312,7 +312,7 @@ public class ShowActionIT { @Test @UseDataProvider("allPublicProjectPermissionsButSECURITYHOTSPOT_ADMIN") public void return_canChangeStatus_false_on_public_project_when_authenticated_without_SECURITYHOTSPOT_ADMIN_permission(@Nullable String permission) { - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); userSessionRule.logIn().registerComponents(project); if (permission != null) { userSessionRule.addProjectPermission(permission, project); @@ -331,7 +331,7 @@ public class ShowActionIT { @Test @UseDataProvider("allPublicProjectPermissionsButSECURITYHOTSPOT_ADMIN") public void return_canChangeStatus_true_on_public_project_when_authenticated_with_SECURITYHOTSPOT_ADMIN_permission(@Nullable String permission) { - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); userSessionRule.registerComponents(project) .addProjectPermission(UserRole.SECURITYHOTSPOT_ADMIN, project); if (permission != null) { @@ -361,7 +361,7 @@ public class ShowActionIT { @Test @UseDataProvider("allPrivateProjectPermissionsButSECURITYHOTSPOT_ADMIN_and_USER") public void return_canChangeStatus_false_on_private_project_without_SECURITYHOTSPOT_ADMIN_permission(@Nullable String permission) { - ComponentDto project = dbTester.components().insertPrivateProject(); + ComponentDto project = dbTester.components().insertPrivateProject().getMainBranchComponent(); userSessionRule .registerComponents(project) .logIn() @@ -383,7 +383,7 @@ public class ShowActionIT { @Test @UseDataProvider("allPrivateProjectPermissionsButSECURITYHOTSPOT_ADMIN_and_USER") public void return_canChangeStatus_false_on_private_project_with_SECURITYHOTSPOT_ADMIN_permission(@Nullable String permission) { - ComponentDto project = dbTester.components().insertPrivateProject(); + ComponentDto project = dbTester.components().insertPrivateProject().getMainBranchComponent(); userSessionRule .registerComponents(project) .logIn() @@ -417,7 +417,7 @@ public class ShowActionIT { @Test @UseDataProvider("statusAndResolutionCombinations") public void returns_status_and_resolution(String status, @Nullable String resolution) { - ComponentDto project = dbTester.components().insertPrivateProject(); + ComponentDto project = dbTester.components().insertPrivateProject().getMainBranchComponent(); userSessionRule.registerComponents(project); userSessionRule.logIn().addProjectPermission(UserRole.USER, project); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); @@ -447,7 +447,7 @@ public class ShowActionIT { @Test public void dispatch_description_sections_of_advanced_rule_in_relevant_field() { - ComponentDto project = dbTester.components().insertPrivateProject(); + ComponentDto project = dbTester.components().insertPrivateProject().getMainBranchComponent(); userSessionRule.registerComponents(project); userSessionRule.logIn().addProjectPermission(UserRole.USER, project); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); @@ -481,7 +481,7 @@ public class ShowActionIT { @Test public void fallbacks_to_default_section_in_case_of_legacy_rule() { - ComponentDto project = dbTester.components().insertPrivateProject(); + ComponentDto project = dbTester.components().insertPrivateProject().getMainBranchComponent(); userSessionRule.registerComponents(project); userSessionRule.logIn().addProjectPermission(UserRole.USER, project); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); @@ -505,7 +505,7 @@ public class ShowActionIT { @Test public void ignore_default_section_if_root_cause_provided() { - ComponentDto project = dbTester.components().insertPrivateProject(); + ComponentDto project = dbTester.components().insertPrivateProject().getMainBranchComponent(); userSessionRule.registerComponents(project); userSessionRule.logIn().addProjectPermission(UserRole.USER, project); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); @@ -541,7 +541,7 @@ public class ShowActionIT { @Test public void returns_html_description_for_custom_rules() { - ComponentDto project = dbTester.components().insertPrivateProject(); + ComponentDto project = dbTester.components().insertPrivateProject().getMainBranchComponent(); userSessionRule.registerComponents(project); userSessionRule.logIn().addProjectPermission(UserRole.USER, project); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); @@ -570,7 +570,7 @@ public class ShowActionIT { @Test public void handles_null_description_for_custom_rules() { - ComponentDto project = dbTester.components().insertPrivateProject(); + ComponentDto project = dbTester.components().insertPrivateProject().getMainBranchComponent(); userSessionRule.registerComponents(project); userSessionRule.logIn().addProjectPermission(UserRole.USER, project); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); @@ -588,7 +588,7 @@ public class ShowActionIT { @Test public void handle_given_description_section_with_3_contexts_return_one_alphabetically() { - ComponentDto project = dbTester.components().insertPrivateProject(); + ComponentDto project = dbTester.components().insertPrivateProject().getMainBranchComponent(); userSessionRule.registerComponents(project); userSessionRule.logIn().addProjectPermission(UserRole.USER, project); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); @@ -624,7 +624,7 @@ public class ShowActionIT { @Test public void returns_hotspot_component_and_rule() { - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); userSessionRule.registerComponents(project); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); RuleDto rule = newRule(SECURITY_HOTSPOT); @@ -643,7 +643,7 @@ public class ShowActionIT { @Test public void returns_no_textRange_when_locations_have_none() { - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); userSessionRule.registerComponents(project); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); RuleDto rule = newRule(SECURITY_HOTSPOT); @@ -660,7 +660,7 @@ public class ShowActionIT { @Test @UseDataProvider("randomTextRangeValues") public void returns_textRange(int startLine, int endLine, int startOffset, int endOffset) { - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); userSessionRule.registerComponents(project); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); RuleDto rule = newRule(SECURITY_HOTSPOT); @@ -681,7 +681,7 @@ public class ShowActionIT { @Test public void returns_no_assignee_when_user_does_not_exist() { - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); userSessionRule.registerComponents(project); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); RuleDto rule = newRule(SECURITY_HOTSPOT); @@ -696,7 +696,7 @@ public class ShowActionIT { @Test public void returns_assignee_details_when_user_exists() { - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); userSessionRule.registerComponents(project); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); RuleDto rule = newRule(SECURITY_HOTSPOT); @@ -718,7 +718,7 @@ public class ShowActionIT { @Test public void returns_no_avatar_if_assignee_has_no_email() { - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); userSessionRule.registerComponents(project); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); RuleDto rule = newRule(SECURITY_HOTSPOT); @@ -735,7 +735,7 @@ public class ShowActionIT { @Test public void returns_inactive_when_assignee_is_inactive() { - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); userSessionRule.registerComponents(project); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); RuleDto rule = newRule(SECURITY_HOTSPOT); @@ -752,7 +752,7 @@ public class ShowActionIT { @Test public void returns_author_login_when_user_does_not_exist() { - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); userSessionRule.registerComponents(project); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); RuleDto rule = newRule(SECURITY_HOTSPOT); @@ -769,7 +769,7 @@ public class ShowActionIT { @Test public void returns_author_details_when_user_exists() { - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); userSessionRule.registerComponents(project); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); RuleDto rule = newRule(SECURITY_HOTSPOT); @@ -790,7 +790,7 @@ public class ShowActionIT { @Test public void returns_no_avatar_if_author_has_no_email() { - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); userSessionRule.registerComponents(project); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); RuleDto rule = newRule(SECURITY_HOTSPOT); @@ -807,7 +807,7 @@ public class ShowActionIT { @Test public void returns_inactive_if_author_is_inactive() { - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); userSessionRule.registerComponents(project); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); RuleDto rule = newRule(SECURITY_HOTSPOT); @@ -835,7 +835,7 @@ public class ShowActionIT { @Test public void returns_textRange_missing_fields() { - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); userSessionRule.registerComponents(project); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); RuleDto rule = newRule(SECURITY_HOTSPOT); @@ -860,7 +860,7 @@ public class ShowActionIT { @UseDataProvider("allSQCategoryAndVulnerabilityProbability") public void returns_securityCategory_and_vulnerabilityProbability_of_rule(Set standards, SQCategory expected) { - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); userSessionRule.registerComponents(project); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); RuleDto rule = newRule(SECURITY_HOTSPOT, t -> t.setSecurityStandards(standards)); @@ -896,7 +896,7 @@ public class ShowActionIT { @Test public void returns_project_twice_when_hotspot_on_project() { - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); userSessionRule.registerComponents(project); RuleDto rule = newRule(SECURITY_HOTSPOT); IssueDto hotspot = dbTester.issues().insertHotspot(rule, project, project, @@ -914,7 +914,7 @@ public class ShowActionIT { @Test public void returns_branch_but_no_pullRequest_on_component_and_project_on_non_main_branch() { - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); String branchName = randomAlphanumeric(248); ComponentDto branch = dbTester.components().insertProjectBranch(project, b -> b.setKey(branchName)); userSessionRule.addProjectBranchMapping(project.uuid(), branch); @@ -936,7 +936,7 @@ public class ShowActionIT { @Test public void returns_pullRequest_but_no_branch_on_component_and_project_on_pullRequest() { - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); String pullRequestKey = randomAlphanumeric(100); ComponentDto pullRequest = dbTester.components().insertProjectBranch(project, t -> t.setBranchType(BranchType.PULL_REQUEST).setKey(pullRequestKey)); @@ -959,7 +959,7 @@ public class ShowActionIT { @Test public void returns_hotspot_changelog_and_comments() { - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); userSessionRule.registerComponents(project); RuleDto rule = newRule(SECURITY_HOTSPOT); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); @@ -996,7 +996,7 @@ public class ShowActionIT { @Test public void returns_user_details_of_users_from_ChangelogAndComments() { - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); userSessionRule.registerComponents(project); RuleDto rule = newRule(SECURITY_HOTSPOT); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); @@ -1020,7 +1020,7 @@ public class ShowActionIT { @Test public void returns_user_of_users_from_ChangelogAndComments_and_assignee_and_author() { - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); userSessionRule.registerComponents(project); RuleDto rule = newRule(SECURITY_HOTSPOT); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); @@ -1050,7 +1050,7 @@ public class ShowActionIT { @Test public void do_not_duplicate_user_if_author_assignee_ChangeLogComment_user() { - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); userSessionRule.registerComponents(project); RuleDto rule = newRule(SECURITY_HOTSPOT); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); @@ -1074,7 +1074,7 @@ public class ShowActionIT { ComponentDto project = dbTester.components().insertPublicProject(componentDto -> componentDto .setName("test-project") .setLongName("test-project") - .setKey("com.sonarsource:test-project")); + .setKey("com.sonarsource:test-project")).getMainBranchComponent(); userSessionRule.registerComponents(project) .addProjectPermission(UserRole.SECURITYHOTSPOT_ADMIN, project); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/issue/AssignActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/issue/AssignActionIT.java index f8facc2266c..0b46b040e9e 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/issue/AssignActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/issue/AssignActionIT.java @@ -62,7 +62,7 @@ public class AssignActionIT { @Before public void setUp() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); context = new ActionContext(issue, issueChangeContext, project); } diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/issue/IssueFinderIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/issue/IssueFinderIT.java index 714a772ad4f..9023c38c46a 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/issue/IssueFinderIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/issue/IssueFinderIT.java @@ -88,7 +88,7 @@ public class IssueFinderIT { private IssueDto insertIssue() { RuleDto rule = ruleDbTester.insert(newRule()); - ComponentDto project = componentDbTester.insertPrivateProject(); + ComponentDto project = componentDbTester.insertPrivateProject().getMainBranchComponent(); ComponentDto file = componentDbTester.insertComponent(newFileDto(project)); return issueDbTester.insert(newIssue(rule, project, file)); } diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/issue/SetSeverityActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/issue/SetSeverityActionIT.java index dd402b053d3..bf4be8145f0 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/issue/SetSeverityActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/issue/SetSeverityActionIT.java @@ -129,7 +129,7 @@ public class SetSeverityActionIT { private IssueDto newIssue() { RuleDto rule = db.rules().insert(newRule()); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); return IssueTesting.newIssue(rule, project, file); } diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/issue/SetTypeActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/issue/SetTypeActionIT.java index 7a0b09b617e..035c7ecc286 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/issue/SetTypeActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/issue/SetTypeActionIT.java @@ -124,7 +124,7 @@ public class SetTypeActionIT { private IssueDto newIssue() { RuleDto rule = db.rules().insert(newRule()); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); return IssueTesting.newIssue(rule, project, file); } diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/issue/TransitionServiceIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/issue/TransitionServiceIT.java index c33eaf80785..a024aaee6bb 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/issue/TransitionServiceIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/issue/TransitionServiceIT.java @@ -63,7 +63,7 @@ public class TransitionServiceIT { @Test public void list_transitions() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); RuleDto rule = db.rules().insert(); IssueDto issue = db.issues().insert(rule, project, file, i -> i.setStatus(STATUS_OPEN).setResolution(null).setType(CODE_SMELL)); @@ -76,7 +76,7 @@ public class TransitionServiceIT { @Test public void list_transitions_returns_empty_list_on_external_issue() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); RuleDto externalRule = db.rules().insert(r -> r.setIsExternal(true)); IssueDto externalIssue = db.issues().insert(externalRule, project, file, i -> i.setStatus(STATUS_OPEN).setResolution(null).setType(CODE_SMELL)); @@ -89,7 +89,7 @@ public class TransitionServiceIT { @Test public void list_transitions_returns_only_transitions_that_do_not_requires_issue_admin_permission() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); RuleDto rule = db.rules().insert(); IssueDto issue = db.issues().insert(rule, project, file, i -> i.setStatus(STATUS_OPEN).setResolution(null).setType(CODE_SMELL)); @@ -102,7 +102,7 @@ public class TransitionServiceIT { @Test public void list_transitions_returns_nothing_when_not_logged() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); RuleDto rule = db.rules().insert(); IssueDto issue = db.issues().insert(rule, project, file, i -> i.setStatus(STATUS_OPEN).setResolution(null).setType(CODE_SMELL)); @@ -114,7 +114,7 @@ public class TransitionServiceIT { @Test public void do_transition() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); RuleDto rule = db.rules().insert(); IssueDto issue = db.issues().insert(rule, project, file, i -> i.setStatus(STATUS_OPEN).setResolution(null).setType(CODE_SMELL)); @@ -128,7 +128,7 @@ public class TransitionServiceIT { @Test public void do_transition_fail_on_external_issue() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); RuleDto externalRule = db.rules().insert(r -> r.setIsExternal(true)); IssueDto externalIssue = db.issues().insert(externalRule, project, file, i -> i.setStatus(STATUS_OPEN).setResolution(null).setType(CODE_SMELL)); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/issue/WebIssueStorageIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/issue/WebIssueStorageIT.java index e415307ccf8..844e312972d 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/issue/WebIssueStorageIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/issue/WebIssueStorageIT.java @@ -64,7 +64,7 @@ public class WebIssueStorageIT { @Test public void load_component_id_from_db() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); String componentUuid = underTest.component(db.getSession(), new DefaultIssue().setComponentUuid(file.uuid())).uuid(); @@ -74,7 +74,7 @@ public class WebIssueStorageIT { @Test public void load_project_id_from_db() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); String projectUuid = underTest.project(db.getSession(), new DefaultIssue().setProjectUuid(project.uuid())).uuid(); @@ -85,7 +85,7 @@ public class WebIssueStorageIT { @Test public void insert_new_issues() { RuleDto rule = db.rules().insert(); - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto dir = db.components().insertComponent(newDirectory(project, "path")); ComponentDto file = db.components().insertComponent(newFileDto(project, dir)); @@ -134,7 +134,7 @@ public class WebIssueStorageIT { @Test public void update_issues() { RuleDto rule = db.rules().insert(); - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto dir = db.components().insertComponent(newDirectory(project, "path")); ComponentDto file = db.components().insertComponent(newFileDto(project, dir)); @@ -217,7 +217,7 @@ public class WebIssueStorageIT { @Test public void rule_uuid_is_set_on_updated_issue() { RuleDto rule = db.rules().insert(); - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto dir = db.components().insertComponent(newDirectory(project, "path")); ComponentDto file = db.components().insertComponent(newFileDto(project, dir)); DefaultIssue issue = newIssue(rule, project, file).toDefaultIssue(); @@ -231,7 +231,7 @@ public class WebIssueStorageIT { @Test public void rule_uuid_is_not_set_on_updated_issue_when_rule_is_removed() { RuleDto rule = db.rules().insert(r -> r.setStatus(REMOVED)); - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto dir = db.components().insertComponent(newDirectory(project, "path")); ComponentDto file = db.components().insertComponent(newFileDto(project, dir)); DefaultIssue issue = newIssue(rule, project, file).toDefaultIssue(); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/issue/ws/AuthorsActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/issue/ws/AuthorsActionIT.java index cffa5d4690b..893f4607e4b 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/issue/ws/AuthorsActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/issue/ws/AuthorsActionIT.java @@ -82,7 +82,7 @@ public class AuthorsActionIT { public void search_authors() { String leia = "leia.organa"; String luke = "luke.skywalker"; - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); permissionIndexer.allowOnlyAnyone(project); RuleDto rule = db.rules().insertIssueRule(); db.issues().insertIssue(rule, project, project, issue -> issue.setAuthorLogin(leia)); @@ -100,7 +100,7 @@ public class AuthorsActionIT { public void search_authors_by_query() { String leia = "leia.organa"; String luke = "luke.skywalker"; - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); permissionIndexer.allowOnlyAnyone(project); RuleDto rule = db.rules().insertIssueRule(); db.issues().insertIssue(rule, project, project, issue -> issue.setAuthorLogin(leia)); @@ -121,8 +121,8 @@ public class AuthorsActionIT { public void search_authors_by_project() { String leia = "leia.organa"; String luke = "luke.skywalker"; - ComponentDto project1 = db.components().insertPrivateProject(); - ComponentDto project2 = db.components().insertPrivateProject(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); permissionIndexer.allowOnlyAnyone(project1, project2); RuleDto rule = db.rules().insertIssueRule(); db.issues().insertIssue(rule, project1, project1, issue -> issue.setAuthorLogin(leia)); @@ -152,7 +152,7 @@ public class AuthorsActionIT { public void search_authors_by_portfolio() { String leia = "leia.organa"; ComponentDto portfolio = db.components().insertPrivatePortfolio(); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); db.components().insertComponent(newProjectCopy(project, portfolio)); permissionIndexer.allowOnlyAnyone(project); RuleDto rule = db.rules().insertIssueRule(); @@ -170,8 +170,8 @@ public class AuthorsActionIT { @Test public void search_authors_by_application() { String leia = "leia.organa"; - ComponentDto application = db.components().insertPrivateApplication(); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto application = db.components().insertPrivateApplication().getMainBranchComponent(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); db.components().insertComponent(newProjectCopy(project, application)); permissionIndexer.allowOnlyAnyone(project); RuleDto rule = db.rules().insertIssueRule(); @@ -191,7 +191,7 @@ public class AuthorsActionIT { String han = "han.solo"; String leia = "leia.organa"; String luke = "luke.skywalker"; - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); permissionIndexer.allowOnlyAnyone(project); RuleDto rule = db.rules().insertIssueRule(); db.issues().insertIssue(rule, project, project, issue -> issue.setAuthorLogin(han)); @@ -212,7 +212,7 @@ public class AuthorsActionIT { @Test public void should_ignore_authors_of_hotspot() { String luke = "luke.skywalker"; - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); permissionIndexer.allowOnlyAnyone(project); db.issues().insertHotspot(project, project, issue -> issue .setAuthorLogin(luke)); @@ -239,7 +239,7 @@ public class AuthorsActionIT { @Test public void fail_when_project_is_not_a_project() { userSession.logIn(); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); permissionIndexer.allowOnlyAnyone(project); @@ -267,7 +267,7 @@ public class AuthorsActionIT { @Test public void json_example() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); permissionIndexer.allowOnlyAnyone(project); RuleDto rule = db.rules().insertIssueRule(); db.issues().insertIssue(rule, project, project, issue -> issue.setAuthorLogin("luke.skywalker")); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/issue/ws/BulkChangeActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/issue/ws/BulkChangeActionIT.java index 3b69d252d12..e2a4c277710 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/issue/ws/BulkChangeActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/issue/ws/BulkChangeActionIT.java @@ -142,7 +142,7 @@ public class BulkChangeActionIT { public void set_type() { UserDto user = db.users().insertUser(); userSession.logIn(user); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); addUserProjectPermissions(user, project, USER, ISSUE_ADMIN); RuleDto rule = db.rules().insertIssueRule(); @@ -167,7 +167,7 @@ public class BulkChangeActionIT { public void set_severity() { UserDto user = db.users().insertUser(); userSession.logIn(user); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); addUserProjectPermissions(user, project, USER, ISSUE_ADMIN); RuleDto rule = db.rules().insertIssueRule(); @@ -192,7 +192,7 @@ public class BulkChangeActionIT { public void add_tags() { UserDto user = db.users().insertUser(); userSession.logIn(user); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); addUserProjectPermissions(user, project, USER, ISSUE_ADMIN); RuleDto rule = db.rules().insertIssueRule(); @@ -218,7 +218,7 @@ public class BulkChangeActionIT { public void add_tags_when_issue_is_resolved_is_accepted() { UserDto user = db.users().insertUser(); userSession.logIn(user); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); addUserProjectPermissions(user, project, USER, ISSUE_ADMIN); RuleDto rule = db.rules().insertIssueRule(); @@ -241,7 +241,7 @@ public class BulkChangeActionIT { public void remove_assignee() { UserDto user = db.users().insertUser(); userSession.logIn(user); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); addUserProjectPermissions(user, project, USER, ISSUE_ADMIN); RuleDto rule = db.rules().insertIssueRule(); @@ -268,7 +268,7 @@ public class BulkChangeActionIT { public void bulk_change_with_comment() { UserDto user = db.users().insertUser(); userSession.logIn(user); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); addUserProjectPermissions(user, project, USER, ISSUE_ADMIN); RuleDto rule = db.rules().insertIssueRule(); @@ -294,7 +294,7 @@ public class BulkChangeActionIT { public void bulk_change_many_issues() { UserDto user = db.users().insertUser(); userSession.logIn(user); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); addUserProjectPermissions(user, project, USER, ISSUE_ADMIN); RuleDto rule = db.rules().insertIssueRule(); @@ -330,7 +330,7 @@ public class BulkChangeActionIT { public void send_notification() { UserDto user = db.users().insertUser(); userSession.logIn(user); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); addUserProjectPermissions(user, project, USER, ISSUE_ADMIN); RuleDto rule = db.rules().insertIssueRule(); @@ -367,7 +367,7 @@ public class BulkChangeActionIT { public void should_ignore_hotspots() { UserDto user = db.users().insertUser(); userSession.logIn(user); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); addUserProjectPermissions(user, project, USER, SECURITYHOTSPOT_ADMIN); IssueDto issue = db.issues().insertHotspot(project, file); @@ -386,7 +386,7 @@ public class BulkChangeActionIT { public void send_notification_on_branch() { UserDto user = db.users().insertUser(); userSession.logIn(user); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto branch = db.components().insertProjectBranch(project, b -> b.setKey("feature").setBranchType(BranchType.BRANCH)); userSession.addProjectBranchMapping(project.uuid(), branch); ComponentDto fileOnBranch = db.components().insertComponent(newFileDto(branch, project.uuid())); @@ -424,7 +424,7 @@ public class BulkChangeActionIT { private void verifySendNoNotification(BranchType branchType) { UserDto user = db.users().insertUser(); userSession.logIn(user); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto branch = db.components().insertProjectBranch(project, b -> b.setKey("feature").setBranchType(branchType)); userSession.addProjectBranchMapping(project.uuid(), branch); ComponentDto fileOnBranch = db.components().insertComponent(newFileDto(branch, project.uuid())); @@ -448,7 +448,7 @@ public class BulkChangeActionIT { public void send_notification_only_on_changed_issues() { UserDto user = db.users().insertUser(); userSession.logIn(user); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); addUserProjectPermissions(user, project, USER, ISSUE_ADMIN); RuleDto rule = db.rules().insertIssueRule(); @@ -484,7 +484,7 @@ public class BulkChangeActionIT { public void ignore_the_issues_that_do_not_match_conditions() { UserDto user = db.users().insertUser(); userSession.logIn(user); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file1 = db.components().insertComponent(newFileDto(project)); ComponentDto file2 = db.components().insertComponent(newFileDto(project)); addUserProjectPermissions(user, project, USER, ISSUE_ADMIN); @@ -518,7 +518,7 @@ public class BulkChangeActionIT { public void ignore_issues_when_there_is_nothing_to_do() { UserDto user = db.users().insertUser(); userSession.logIn(user); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file1 = db.components().insertComponent(newFileDto(project)); ComponentDto file2 = db.components().insertComponent(newFileDto(project)); addUserProjectPermissions(user, project, USER, ISSUE_ADMIN); @@ -552,7 +552,7 @@ public class BulkChangeActionIT { public void add_comment_only_on_changed_issues() { UserDto user = db.users().insertUser(); userSession.logIn(user); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file1 = db.components().insertComponent(newFileDto(project)); ComponentDto file2 = db.components().insertComponent(newFileDto(project)); addUserProjectPermissions(user, project, USER, ISSUE_ADMIN); @@ -583,7 +583,7 @@ public class BulkChangeActionIT { public void ignore_external_issue() { UserDto user = db.users().insertUser(); userSession.logIn(user); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); addUserProjectPermissions(user, project, USER, ISSUE_ADMIN); RuleDto rule = db.rules().insertIssueRule(); IssueDto issue = db.issues().insertIssue(rule, project, project, i -> i.setStatus(STATUS_OPEN).setResolution(null).setType(CODE_SMELL)); @@ -602,9 +602,9 @@ public class BulkChangeActionIT { public void issues_on_which_user_has_not_browse_permission_are_ignored() { UserDto user = db.users().insertUser(); userSession.logIn(user); - ComponentDto project1 = db.components().insertPrivateProject(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); addUserProjectPermissions(user, project1, USER, ISSUE_ADMIN); - ComponentDto project2 = db.components().insertPrivateProject(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); RuleDto rule = db.rules().insertIssueRule(); IssueDto authorizedIssue = db.issues().insertIssue(rule, project1, project1, i -> i.setType(BUG) .setStatus(STATUS_OPEN).setResolution(null)); @@ -634,9 +634,9 @@ public class BulkChangeActionIT { public void does_not_update_type_when_no_issue_admin_permission() { UserDto user = db.users().insertUser(); userSession.logIn(user); - ComponentDto project1 = db.components().insertPrivateProject(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); addUserProjectPermissions(user, project1, USER, ISSUE_ADMIN); - ComponentDto project2 = db.components().insertPrivateProject(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); addUserProjectPermissions(user, project2, USER); RuleDto rule = db.rules().insertIssueRule(); IssueDto authorizedIssue1 = db.issues().insertIssue(rule, project1, project1, i -> i.setType(BUG) @@ -666,9 +666,9 @@ public class BulkChangeActionIT { public void does_not_update_severity_when_no_issue_admin_permission() { UserDto user = db.users().insertUser(); userSession.logIn(user); - ComponentDto project1 = db.components().insertPrivateProject(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); addUserProjectPermissions(user, project1, USER, ISSUE_ADMIN); - ComponentDto project2 = db.components().insertPrivateProject(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); addUserProjectPermissions(user, project2, USER); RuleDto rule = db.rules().insertIssueRule(); IssueDto authorizedIssue1 = db.issues().insertIssue(rule, project1, project1, i -> i.setSeverity(MAJOR) @@ -698,7 +698,7 @@ public class BulkChangeActionIT { public void fail_when_only_comment_action() { UserDto user = db.users().insertUser(); userSession.logIn(user); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); addUserProjectPermissions(user, project, USER); RuleDto rule = db.rules().insertIssueRule(); IssueDto issue = db.issues().insertIssue(rule, project, project, i -> i.setType(BUG) diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/issue/ws/ChangelogActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/issue/ws/ChangelogActionIT.java index 0841c6ef9d8..17c9d0c4207 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/issue/ws/ChangelogActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/issue/ws/ChangelogActionIT.java @@ -73,7 +73,7 @@ public class ChangelogActionIT { @Before public void setUp() { - project = db.components().insertPrivateProject(); + project = db.components().insertPrivateProject().getMainBranchComponent(); file = db.components().insertComponent(newFileDto(project)); } diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/issue/ws/DoTransitionActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/issue/ws/DoTransitionActionIT.java index bdff39fe5db..eca330c8545 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/issue/ws/DoTransitionActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/issue/ws/DoTransitionActionIT.java @@ -117,7 +117,7 @@ public class DoTransitionActionIT { @Test public void do_transition() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); RuleDto rule = db.rules().insertIssueRule(); IssueDto issue = db.issues().insertIssue(rule, project, file, i -> i.setStatus(STATUS_OPEN).setResolution(null).setType(CODE_SMELL)); @@ -136,7 +136,7 @@ public class DoTransitionActionIT { @Test public void do_transition_is_not_distributed_for_pull_request() { RuleDto rule = db.rules().insertIssueRule(); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto pullRequest = db.components().insertProjectBranch(project, b -> b.setKey("myBranch1") .setBranchType(BranchType.PULL_REQUEST) @@ -154,7 +154,7 @@ public class DoTransitionActionIT { @Test public void fail_if_external_issue() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); RuleDto externalRule = db.rules().insertIssueRule(r -> r.setIsExternal(true)); IssueDto externalIssue = db.issues().insertIssue(externalRule, project, file, i -> i.setStatus(STATUS_OPEN).setResolution(null).setType(CODE_SMELL)); @@ -167,7 +167,7 @@ public class DoTransitionActionIT { @Test public void fail_if_hotspot() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); RuleDto rule = db.rules().insertHotspotRule(); IssueDto hotspot = db.issues().insertHotspot(rule, project, file, i -> i.setType(RuleType.SECURITY_HOTSPOT)); @@ -197,7 +197,7 @@ public class DoTransitionActionIT { @Test public void fail_if_no_transition_param() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); RuleDto rule = db.rules().insertIssueRule(); IssueDto issue = db.issues().insertIssue(rule, project, file, i -> i.setStatus(STATUS_OPEN).setResolution(null).setType(CODE_SMELL)); @@ -209,7 +209,7 @@ public class DoTransitionActionIT { @Test public void fail_if_not_enough_permission_to_access_issue() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); RuleDto rule = db.rules().insertIssueRule(); IssueDto issue = db.issues().insertIssue(rule, project, file, i -> i.setStatus(STATUS_OPEN).setResolution(null).setType(CODE_SMELL)); @@ -221,7 +221,7 @@ public class DoTransitionActionIT { @Test public void fail_if_not_enough_permission_to_apply_transition() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); RuleDto rule = db.rules().insertIssueRule(); IssueDto issue = db.issues().insertIssue(rule, project, file, i -> i.setStatus(STATUS_OPEN).setResolution(null).setType(CODE_SMELL)); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/issue/ws/IssueUpdaterIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/issue/ws/IssueUpdaterIT.java index 650ca9ad145..2ac0c3042a5 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/issue/ws/IssueUpdaterIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/issue/ws/IssueUpdaterIT.java @@ -105,7 +105,7 @@ public class IssueUpdaterIT { public void verify_notification_without_resolution() { UserDto assignee = db.users().insertUser(); RuleDto rule = db.rules().insertIssueRule(); - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); DefaultIssue issue = db.issues().insertIssue(rule, project, file, t -> t.setSeverity(MAJOR).setAssigneeUuid(assignee.getUuid())) @@ -134,7 +134,7 @@ public class IssueUpdaterIT { public void verify_notification_with_resolution() { UserDto assignee = db.users().insertUser(); RuleDto rule = db.rules().insertIssueRule(); - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); DefaultIssue issue = db.issues().insertIssue(rule, project, file, t -> t.setSeverity(MAJOR).setAssigneeUuid(assignee.getUuid())) @@ -162,7 +162,7 @@ public class IssueUpdaterIT { @Test public void verify_notification_on_branch() { RuleDto rule = db.rules().insertIssueRule(); - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto branch = db.components().insertProjectBranch(project, t -> t.setBranchType(BRANCH)); ComponentDto file = db.components().insertComponent(newFileDto(branch, project.uuid())); DefaultIssue issue = db.issues().insertIssue(rule, branch, file, @@ -190,7 +190,7 @@ public class IssueUpdaterIT { @Test public void verify_no_notification_on_pr() { RuleDto rule = db.rules().insertIssueRule(); - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto branch = db.components().insertProjectBranch(project, t -> t.setBranchType(BranchType.PULL_REQUEST)); ComponentDto file = db.components().insertComponent(newFileDto(branch, project.uuid())); DefaultIssue issue = db.issues().insertIssue(rule, branch, file, t -> t.setSeverity(MAJOR)).toDefaultIssue(); @@ -205,7 +205,7 @@ public class IssueUpdaterIT { @Test public void verify_notification_when_issue_is_linked_on_removed_rule() { RuleDto rule = db.rules().insertIssueRule(r -> r.setStatus(RuleStatus.REMOVED)); - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); DefaultIssue issue = db.issues().insertIssue(rule, project, file, t -> t.setSeverity(MAJOR)).toDefaultIssue(); IssueChangeContext context = issueChangeContextByUserBuilder(new Date(), "user_uuid").build(); @@ -220,7 +220,7 @@ public class IssueUpdaterIT { public void verify_notification_when_assignee_has_changed() { UserDto oldAssignee = db.users().insertUser(); RuleDto rule = db.rules().insertIssueRule(); - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); DefaultIssue issue = db.issues().insertIssue(rule, project, file, t -> t.setAssigneeUuid(oldAssignee.getUuid())) .toDefaultIssue(); @@ -248,7 +248,7 @@ public class IssueUpdaterIT { @Test public void saveIssue_populates_specified_SearchResponseData_with_rule_project_and_component_retrieved_from_DB() { RuleDto rule = db.rules().insertIssueRule(); - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); IssueDto issueDto = db.issues().insertIssue(rule, project, file); DefaultIssue issue = issueDto.setSeverity(MAJOR).toDefaultIssue(); @@ -274,7 +274,7 @@ public class IssueUpdaterIT { @Test public void saveIssue_populates_specified_SearchResponseData_with_no_rule_but_with_project_and_component_if_rule_is_removed() { RuleDto rule = db.rules().insertIssueRule(r -> r.setStatus(RuleStatus.REMOVED)); - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); IssueDto issueDto = db.issues().insertIssue(rule, project, file); DefaultIssue issue = issueDto.setSeverity(MAJOR).toDefaultIssue(); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/issue/ws/PullActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/issue/ws/PullActionIT.java index 6327ad8ee84..eb5302f3d6a 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/issue/ws/PullActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/issue/ws/PullActionIT.java @@ -98,11 +98,11 @@ public class PullActionIT { public void setUp() { when(system2.now()).thenReturn(NOW); correctRule = db.rules().insertIssueRule(); - correctProject = db.components().insertPrivateProject(); + correctProject = db.components().insertPrivateProject().getMainBranchComponent(); correctFile = db.components().insertComponent(newFileDto(correctProject)); incorrectRule = db.rules().insertIssueRule(); - incorrectProject = db.components().insertPrivateProject(); + incorrectProject = db.components().insertPrivateProject().getMainBranchComponent(); incorrectFile = db.components().insertComponent(newFileDto(incorrectProject)); when(taintChecker.getTaintRepositories()).thenReturn(List.of("roslyn.sonaranalyzer.security.cs", @@ -268,7 +268,7 @@ public class PullActionIT { @Test public void givenIssueOnAnotherBranch_returnOneIssue() throws IOException { - ComponentDto developBranch = componentDbTester.insertPrivateProjectWithCustomBranch("develop"); + ComponentDto developBranch = componentDbTester.insertPrivateProjectWithCustomBranch("develop").getMainBranchComponent(); ComponentDto developFile = db.components().insertComponent(newFileDto(developBranch)); generateIssues(correctRule, developBranch, developFile, 1); loginWithBrowsePermission(developBranch.uuid(), developFile.uuid()); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/issue/ws/PullTaintActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/issue/ws/PullTaintActionIT.java index 5521f18f872..a3d623e0a1e 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/issue/ws/PullTaintActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/issue/ws/PullTaintActionIT.java @@ -23,7 +23,6 @@ import java.io.IOException; import java.io.InputStream; import java.util.ArrayList; import java.util.List; -import org.apache.commons.lang.RandomStringUtils; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -104,11 +103,11 @@ public class PullTaintActionIT { db.getDbClient().ruleRepositoryDao().insert(db.getSession(), List.of(repository)); correctRule = db.rules().insertIssueRule(r -> r.setRepositoryKey("javasecurity").setRuleKey("S1000").setSeverity(3)); - correctProject = db.components().insertPrivateProject(); + correctProject = db.components().insertPrivateProject().getMainBranchComponent(); correctFile = db.components().insertComponent(newFileDto(correctProject)); incorrectRule = db.rules().insertIssueRule(); - incorrectProject = db.components().insertPrivateProject(); + incorrectProject = db.components().insertPrivateProject().getMainBranchComponent(); incorrectFile = db.components().insertComponent(newFileDto(incorrectProject)); when(taintChecker.getTaintRepositories()).thenReturn(List.of("roslyn.sonaranalyzer.security.cs", @@ -268,7 +267,7 @@ public class PullTaintActionIT { @Test public void givenTaintOnAnotherBranch_returnOneTaint() throws IOException { - ComponentDto developBranch = componentDbTester.insertPrivateProjectWithCustomBranch("develop"); + ComponentDto developBranch = componentDbTester.insertPrivateProjectWithCustomBranch("develop").getMainBranchComponent(); ComponentDto developFile = db.components().insertComponent(newFileDto(developBranch)); generateTaints(correctRule, developBranch, developFile, 1); loginWithBrowsePermission(developBranch.uuid(), developFile.uuid()); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/issue/ws/ReindexActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/issue/ws/ReindexActionIT.java index 6f4ed0072c9..751d9ad4b74 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/issue/ws/ReindexActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/issue/ws/ReindexActionIT.java @@ -68,7 +68,7 @@ public class ReindexActionIT { @Test public void reindex_project() { - ProjectDto project = db.components().insertPrivateProjectDto(); + ProjectDto project = db.components().insertPrivateProject().getProjectDto(); userSession.logIn().setSystemAdministrator(); userSession.addProjectPermission(UserRole.ADMIN, project); @@ -101,7 +101,7 @@ public class ReindexActionIT { @Test public void fail_if_not_authorized() { - ProjectDto project = db.components().insertPrivateProjectDto(); + ProjectDto project = db.components().insertPrivateProject().getProjectDto(); userSession.addProjectPermission(UserRole.USER, project); TestRequest testRequest = tester.newRequest().setParam("project", project.getKey()); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/issue/ws/SearchActionComponentsIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/issue/ws/SearchActionComponentsIT.java index 8d8585e3f38..9b7c46f4070 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/issue/ws/SearchActionComponentsIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/issue/ws/SearchActionComponentsIT.java @@ -111,7 +111,7 @@ public class SearchActionComponentsIT { @Test public void search_all_issues_when_no_parameter() { RuleDto rule = db.rules().insertIssueRule(); - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto projectFile = db.components().insertComponent(newFileDto(project)); IssueDto issue = db.issues().insertIssue(rule, project, projectFile); allowAnyoneOnProjects(project); @@ -126,10 +126,10 @@ public class SearchActionComponentsIT { @Test public void issues_on_different_projects() { RuleDto rule = db.rules().insertIssueRule(r -> r.setRuleKey(RuleKey.of("xoo", "x1"))); - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); IssueDto issue1 = db.issues().insertIssue(rule, project, file); - ComponentDto project2 = db.components().insertPublicProject(); + ComponentDto project2 = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto file2 = db.components().insertComponent(newFileDto(project2)); IssueDto issue2 = db.issues().insertIssue(rule, project2, file2); allowAnyoneOnProjects(project, project2); @@ -149,7 +149,7 @@ public class SearchActionComponentsIT { @Test public void search_since_in_new_code_period_on_project() { - ComponentDto project = db.components().insertPublicProject(p -> p.setKey("PK1")); + ComponentDto project = db.components().insertPublicProject(p -> p.setKey("PK1")).getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project, null, "F1").setKey("FK1")); db.components().insertSnapshot(project, a -> a.setPeriodDate(parseDateTime("2015-09-03T00:00:00+0100").getTime())); RuleDto rule = db.rules().insertIssueRule(r -> r.setRuleKey(RuleKey.of("xoo", "x1"))); @@ -171,7 +171,7 @@ public class SearchActionComponentsIT { @Test public void search_by_file_uuid() { - ComponentDto project = db.components().insertPublicProject(p -> p.setKey("PK1")); + ComponentDto project = db.components().insertPublicProject(p -> p.setKey("PK1")).getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project, null, "F1").setKey("FK1")); RuleDto rule = db.rules().insertIssueRule(r -> r.setRuleKey(RuleKey.of("xoo", "x1"))); IssueDto issue = db.issues().insertIssue(rule, project, file, i -> i.setKee("82fd47d4-b650-4037-80bc-7b112bd4eac2")); @@ -191,7 +191,7 @@ public class SearchActionComponentsIT { @Test public void search_by_file_key() { - ComponentDto project = db.components().insertPublicProject(p -> p.setKey("PK1")); + ComponentDto project = db.components().insertPublicProject(p -> p.setKey("PK1")).getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project, null, "F1").setKey("FK1")); ComponentDto unitTest = db.components().insertComponent(newFileDto(project, null, "F2").setQualifier(Qualifiers.UNIT_TEST_FILE).setKey("FK2")); RuleDto rule = db.rules().insertIssueRule(r -> r.setRuleKey(RuleKey.of("xoo", "x1"))); @@ -213,7 +213,7 @@ public class SearchActionComponentsIT { @Test public void search_by_directory_path() { - ComponentDto project = db.components().insertPublicProject(p -> p.setKey("PK1")); + ComponentDto project = db.components().insertPublicProject(p -> p.setKey("PK1")).getMainBranchComponent(); ComponentDto directory = db.components().insertComponent(newDirectory(project, "D1", "src/main/java/dir")); ComponentDto file = db.components().insertComponent(newFileDto(project, null, "F1").setKey("FK1").setPath(directory.path() + "/MyComponent.java")); RuleDto rule = db.rules().insertIssueRule(r -> r.setRuleKey(RuleKey.of("xoo", "x1"))); @@ -244,7 +244,7 @@ public class SearchActionComponentsIT { @Test public void search_by_view_uuid() { - ComponentDto project = db.components().insertPublicProject(p -> p.setKey("PK1")); + ComponentDto project = db.components().insertPublicProject(p -> p.setKey("PK1")).getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project, null, "F1").setKey("FK1")); ComponentDto view = db.components().insertComponent(ComponentTesting.newPortfolio("V1").setKey("MyView")); db.components().insertComponent(newProjectCopy(project, view)); @@ -261,7 +261,7 @@ public class SearchActionComponentsIT { @Test public void search_by_sub_view_uuid() { - ComponentDto project = db.components().insertPublicProject(p -> p.setKey("PK1")); + ComponentDto project = db.components().insertPublicProject(p -> p.setKey("PK1")).getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project, null, "F1").setKey("FK1")); RuleDto rule = db.rules().insertIssueRule(r -> r.setRuleKey(RuleKey.of("xoo", "x1"))); db.issues().insertIssue(rule, project, file, i -> i.setKee("82fd47d4-b650-4037-80bc-7b112bd4eac2")); @@ -279,7 +279,7 @@ public class SearchActionComponentsIT { @Test public void search_by_sub_view_uuid_return_only_authorized_view() { - ComponentDto project = db.components().insertPublicProject(p -> p.setKey("PK1")); + ComponentDto project = db.components().insertPublicProject(p -> p.setKey("PK1")).getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project, null, "F1").setKey("FK1")); RuleDto rule = db.rules().insertIssueRule(r -> r.setRuleKey(RuleKey.of("xoo", "x1"))); db.issues().insertIssue(rule, project, file, i -> i.setKee("82fd47d4-b650-4037-80bc-7b112bd4eac2")); @@ -298,9 +298,9 @@ public class SearchActionComponentsIT { @Test public void search_by_application_key() { - ComponentDto application = db.components().insertPrivateApplication(); - ComponentDto project1 = db.components().insertPrivateProject(); - ComponentDto project2 = db.components().insertPrivateProject(); + ComponentDto application = db.components().insertPrivateApplication().getMainBranchComponent(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); db.components().insertComponents(newProjectCopy(project1, application)); db.components().insertComponents(newProjectCopy(project2, application)); RuleDto rule = db.rules().insertIssueRule(); @@ -320,18 +320,18 @@ public class SearchActionComponentsIT { @Test public void search_by_application_key_and_branch() { - ComponentDto application = db.components().insertPrivateProject(c -> c.setQualifier(APP).setKey("app")); + ComponentDto application = db.components().insertPrivateProject(c -> c.setQualifier(APP).setKey("app")).getMainBranchComponent(); String appBranch1 = "app-branch1"; String appBranch2 = "app-branch2"; String proj1branch1 = "proj1branch1"; String proj1branch2 = "proj1branch2"; ComponentDto applicationBranch1 = db.components().insertProjectBranch(application, a -> a.setKey(appBranch1)); ComponentDto applicationBranch2 = db.components().insertProjectBranch(application, a -> a.setKey(appBranch2)); - ComponentDto project1 = db.components().insertPrivateProject(p -> p.setKey("prj1")); + ComponentDto project1 = db.components().insertPrivateProject(p -> p.setKey("prj1")).getMainBranchComponent(); ComponentDto project1Branch1 = db.components().insertProjectBranch(project1, b -> b.setKey(proj1branch1)); ComponentDto fileOnProject1Branch1 = db.components().insertComponent(newFileDto(project1Branch1, project1.uuid())); ComponentDto project1Branch2 = db.components().insertProjectBranch(project1, b -> b.setKey(proj1branch2)); - ComponentDto project2 = db.components().insertPrivateProject(p -> p.setKey("prj2")); + ComponentDto project2 = db.components().insertPrivateProject(p -> p.setKey("prj2")).getMainBranchComponent(); db.components().insertComponents(newProjectCopy(project1Branch1, applicationBranch1)); db.components().insertComponents(newProjectCopy(project2, applicationBranch1)); db.components().insertComponents(newProjectCopy(project1Branch2, applicationBranch2)); @@ -374,8 +374,8 @@ public class SearchActionComponentsIT { @Test public void ignore_application_without_browse_permission() { - ComponentDto project = db.components().insertPublicProject(); - ComponentDto application = db.components().insertPublicApplication(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); + ComponentDto application = db.components().insertPublicApplication().getMainBranchComponent(); db.components().insertComponents(newProjectCopy("PC1", project, application)); RuleDto rule = db.rules().insertIssueRule(); db.issues().insertIssue(rule, project, project); @@ -391,8 +391,8 @@ public class SearchActionComponentsIT { @Test public void search_application_without_projects() { - ComponentDto project = db.components().insertPublicProject(); - ComponentDto application = db.components().insertPublicApplication(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); + ComponentDto application = db.components().insertPublicApplication().getMainBranchComponent(); RuleDto rule = db.rules().insertIssueRule(); db.issues().insertIssue(rule, project, project); allowAnyoneOnProjects(project, application); @@ -409,15 +409,15 @@ public class SearchActionComponentsIT { public void search_by_application_and_by_new_code_period() { Date now = new Date(); RuleDto rule = db.rules().insertIssueRule(); - ComponentDto application = db.components().insertPublicApplication(); + ComponentDto application = db.components().insertPublicApplication().getMainBranchComponent(); // Project 1 - ComponentDto project1 = db.components().insertPublicProject(); + ComponentDto project1 = db.components().insertPublicProject().getMainBranchComponent(); db.components().insertSnapshot(project1, s -> s.setPeriodDate(addDays(now, -14).getTime())); db.components().insertComponents(newProjectCopy("PC1", project1, application)); IssueDto project1Issue1 = db.issues().insertIssue(rule, project1, project1, i -> i.setIssueCreationDate(addDays(now, -10))); IssueDto project1Issue2 = db.issues().insertIssue(rule, project1, project1, i -> i.setIssueCreationDate(addDays(now, -20))); // Project 2 - ComponentDto project2 = db.components().insertPublicProject(); + ComponentDto project2 = db.components().insertPublicProject().getMainBranchComponent(); db.components().insertSnapshot(project2, s -> s.setPeriodDate(addDays(now, -25).getTime())); db.components().insertComponents(newProjectCopy("PC2", project2, application)); IssueDto project2Issue1 = db.issues().insertIssue(rule, project2, project2, i -> i.setIssueCreationDate(addDays(now, -15))); @@ -438,9 +438,9 @@ public class SearchActionComponentsIT { @Test public void search_by_application_and_project() { - ComponentDto project1 = db.components().insertPublicProject(); - ComponentDto project2 = db.components().insertPublicProject(); - ComponentDto application = db.components().insertPublicApplication(); + ComponentDto project1 = db.components().insertPublicProject().getMainBranchComponent(); + ComponentDto project2 = db.components().insertPublicProject().getMainBranchComponent(); + ComponentDto application = db.components().insertPublicApplication().getMainBranchComponent(); db.components().insertComponents(newProjectCopy("PC1", project1, application)); db.components().insertComponents(newProjectCopy("PC2", project2, application)); RuleDto rule = db.rules().insertIssueRule(); @@ -463,15 +463,15 @@ public class SearchActionComponentsIT { public void search_by_application_and_project_and_new_code_period() { Date now = new Date(); RuleDto rule = db.rules().insertIssueRule(); - ComponentDto application = db.components().insertPublicApplication(); + ComponentDto application = db.components().insertPublicApplication().getMainBranchComponent(); // Project 1 - ComponentDto project1 = db.components().insertPublicProject(); + ComponentDto project1 = db.components().insertPublicProject().getMainBranchComponent(); db.components().insertSnapshot(project1, s -> s.setPeriodDate(addDays(now, -14).getTime())); db.components().insertComponents(newProjectCopy("PC1", project1, application)); IssueDto project1Issue1 = db.issues().insertIssue(rule, project1, project1, i -> i.setIssueCreationDate(addDays(now, -10))); IssueDto project1Issue2 = db.issues().insertIssue(rule, project1, project1, i -> i.setIssueCreationDate(addDays(now, -20))); // Project 2 - ComponentDto project2 = db.components().insertPublicProject(); + ComponentDto project2 = db.components().insertPublicProject().getMainBranchComponent(); db.components().insertSnapshot(project2, s -> s.setPeriodDate(addDays(now, -25).getTime())); db.components().insertComponents(newProjectCopy("PC2", project2, application)); IssueDto project2Issue1 = db.issues().insertIssue(rule, project2, project2, i -> i.setIssueCreationDate(addDays(now, -15))); @@ -495,15 +495,15 @@ public class SearchActionComponentsIT { public void search_by_application_and_by_new_code_period_when_one_project_has_no_leak() { Date now = new Date(); RuleDto rule = db.rules().insertIssueRule(); - ComponentDto application = db.components().insertPublicApplication(); + ComponentDto application = db.components().insertPublicApplication().getMainBranchComponent(); // Project 1 - ComponentDto project1 = db.components().insertPublicProject(); + ComponentDto project1 = db.components().insertPublicProject().getMainBranchComponent(); db.components().insertSnapshot(project1, s -> s.setPeriodDate(addDays(now, -14).getTime())); db.components().insertComponents(newProjectCopy("PC1", project1, application)); IssueDto project1Issue1 = db.issues().insertIssue(rule, project1, project1, i -> i.setIssueCreationDate(addDays(now, -10))); IssueDto project1Issue2 = db.issues().insertIssue(rule, project1, project1, i -> i.setIssueCreationDate(addDays(now, -20))); // Project 2, without leak => no issue form it should be returned - ComponentDto project2 = db.components().insertPublicProject(); + ComponentDto project2 = db.components().insertPublicProject().getMainBranchComponent(); db.components().insertSnapshot(project2, s -> s.setPeriodDate(null)); db.components().insertComponents(newProjectCopy("PC2", project2, application)); IssueDto project2Issue1 = db.issues().insertIssue(rule, project2, project2, i -> i.setIssueCreationDate(addDays(now, -15))); @@ -525,7 +525,7 @@ public class SearchActionComponentsIT { @Test public void search_by_branch() { RuleDto rule = db.rules().insertIssueRule(); - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); IssueDto issue = db.issues().insertIssue(rule, project, file); @@ -563,7 +563,7 @@ public class SearchActionComponentsIT { @Test public void return_branch_in_component_list() { RuleDto rule = db.rules().insertIssueRule(); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto projectFile = db.components().insertComponent(newFileDto(project)); IssueDto projectIssue = db.issues().insertIssue(rule, project, projectFile); String branchName = randomAlphanumeric(248); @@ -588,7 +588,7 @@ public class SearchActionComponentsIT { @Test public void search_by_pull_request() { RuleDto rule = db.rules().insertIssueRule(); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto projectFile = db.components().insertComponent(newFileDto(project)); IssueDto projectIssue = db.issues().insertIssue(rule, project, projectFile); @@ -617,7 +617,7 @@ public class SearchActionComponentsIT { @Test public void search_using_main_branch_name() { RuleDto rule = db.rules().insertIssueRule(); - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto projectFile = db.components().insertComponent(newFileDto(project)); IssueDto projectIssue = db.issues().insertIssue(rule, project, projectFile); allowAnyoneOnProjects(project); @@ -641,7 +641,7 @@ public class SearchActionComponentsIT { @Test public void does_not_return_branch_issues_on_not_contextualized_search() { RuleDto rule = db.rules().insertIssueRule(); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto projectFile = db.components().insertComponent(newFileDto(project)); IssueDto projectIssue = db.issues().insertIssue(rule, project, projectFile); ComponentDto branch = db.components().insertProjectBranch(project); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/issue/ws/SearchActionFacetsIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/issue/ws/SearchActionFacetsIT.java index 63f671a35e7..d975f360a1a 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/issue/ws/SearchActionFacetsIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/issue/ws/SearchActionFacetsIT.java @@ -92,7 +92,7 @@ public class SearchActionFacetsIT { @Test public void display_all_facets() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); RuleDto rule = db.rules().insertIssueRule(); UserDto user = db.users().insertUser(); @@ -129,7 +129,7 @@ public class SearchActionFacetsIT { @Test public void display_projects_facet() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); RuleDto rule = db.rules().insertIssueRule(); db.issues().insertIssue(rule, project, file); @@ -148,9 +148,9 @@ public class SearchActionFacetsIT { @Test public void projects_facet_is_sticky() { - ComponentDto project1 = db.components().insertPublicProject(); - ComponentDto project2 = db.components().insertPublicProject(); - ComponentDto project3 = db.components().insertPublicProject(); + ComponentDto project1 = db.components().insertPublicProject().getMainBranchComponent(); + ComponentDto project2 = db.components().insertPublicProject().getMainBranchComponent(); + ComponentDto project3 = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto file1 = db.components().insertComponent(newFileDto(project1)); ComponentDto file2 = db.components().insertComponent(newFileDto(project2)); ComponentDto file3 = db.components().insertComponent(newFileDto(project3)); @@ -173,7 +173,7 @@ public class SearchActionFacetsIT { @Test public void display_directory_facet_using_project() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto directory = db.components().insertComponent(newDirectory(project, "src/main/java/dir")); ComponentDto file = db.components().insertComponent(newFileDto(project, directory)); RuleDto rule = db.rules().insertIssueRule(); @@ -194,7 +194,7 @@ public class SearchActionFacetsIT { @Test public void fail_to_display_directory_facet_when_no_project_is_set() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto directory = db.components().insertComponent(newDirectory(project, "src")); ComponentDto file = db.components().insertComponent(newFileDto(project, directory)); RuleDto rule = db.rules().insertIssueRule(); @@ -213,7 +213,7 @@ public class SearchActionFacetsIT { @Test public void display_files_facet_with_project() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto file1 = db.components().insertComponent(newFileDto(project)); ComponentDto file2 = db.components().insertComponent(newFileDto(project)); ComponentDto file3 = db.components().insertComponent(newFileDto(project)); @@ -236,7 +236,7 @@ public class SearchActionFacetsIT { @Test public void fail_to_display_fileUuids_facet_when_no_project_is_set() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); RuleDto rule = db.rules().insertIssueRule(); db.issues().insertIssue(rule, project, file); @@ -255,7 +255,7 @@ public class SearchActionFacetsIT { @Test public void check_facets_max_size_for_issues() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); Random random = new Random(); IntStream.rangeClosed(1, 110) .forEach(index -> { @@ -309,7 +309,7 @@ public class SearchActionFacetsIT { RuleDto rule = db.rules().insertIssueRule(); IntStream.rangeClosed(1, 110) .forEach(i -> { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); db.issues().insertIssue(rule, project, project); }); indexPermissions(); @@ -325,8 +325,8 @@ public class SearchActionFacetsIT { @Test public void display_zero_valued_facets_for_selected_items_having_no_issue() { - ComponentDto project1 = db.components().insertPublicProject(); - ComponentDto project2 = db.components().insertPublicProject(); + ComponentDto project1 = db.components().insertPublicProject().getMainBranchComponent(); + ComponentDto project2 = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto file1 = db.components().insertComponent(newFileDto(project1)); ComponentDto file2 = db.components().insertComponent(newFileDto(project1)); RuleDto rule1 = db.rules().insertIssueRule(); @@ -389,7 +389,7 @@ public class SearchActionFacetsIT { @Test public void assigned_to_me_facet_is_sticky_relative_to_assignees() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); indexPermissions(); ComponentDto file = db.components().insertComponent(newFileDto(project)); RuleDto rule = db.rules().insertIssueRule(); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/issue/ws/SearchActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/issue/ws/SearchActionIT.java index efe286f42f0..e93f2df7b00 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/issue/ws/SearchActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/issue/ws/SearchActionIT.java @@ -161,7 +161,7 @@ public class SearchActionIT { public void response_contains_all_fields_except_additional_fields() { UserDto user = db.users().insertUser(); userSession.logIn(user); - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); UserDto simon = db.users().insertUser(); RuleDto rule = newIssueRule(); @@ -200,7 +200,7 @@ public class SearchActionIT { public void response_contains_correct_actions() { UserDto user = db.users().insertUser(); userSession.logIn(user); - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); RuleDto rule = newIssueRule(); db.issues().insertIssue(rule, project, file, i -> i.setStatus(STATUS_OPEN)); @@ -234,7 +234,7 @@ public class SearchActionIT { @Test public void issue_on_external_rule() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); RuleDto rule = db.rules().insertIssueRule(RuleTesting.EXTERNAL_XOO, r -> r.setIsExternal(true).setLanguage("xoo")); IssueDto issue = db.issues().insertIssue(rule, project, file); @@ -250,7 +250,7 @@ public class SearchActionIT { @Test public void issue_on_external_adhoc_rule_without_metadata() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); indexPermissions(); ComponentDto file = db.components().insertComponent(newFileDto(project)); RuleDto rule = db.rules().insertIssueRule(RuleTesting.EXTERNAL_XOO, r -> r.setIsExternal(true) @@ -276,7 +276,7 @@ public class SearchActionIT { @Test public void issue_on_external_adhoc_rule_with_metadata() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); indexPermissions(); ComponentDto file = db.components().insertComponent(newFileDto(project)); RuleDto rule = db.rules().insertIssueRule(RuleTesting.EXTERNAL_XOO, @@ -303,7 +303,7 @@ public class SearchActionIT { @Test public void issue_with_cross_file_locations() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); indexPermissions(); ComponentDto file = db.components().insertComponent(newFileDto(project)); ComponentDto anotherFile = db.components().insertComponent(newFileDto(project)); @@ -358,7 +358,7 @@ public class SearchActionIT { public void issue_with_comments() { UserDto john = db.users().insertUser(u -> u.setLogin("john").setName("John")); UserDto fabrice = db.users().insertUser(u -> u.setLogin("fabrice").setName("Fabrice").setEmail("fabrice@email.com")); - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); indexPermissions(); ComponentDto file = db.components().insertComponent(newFileDto(project)); RuleDto rule = newIssueRule(); @@ -406,7 +406,7 @@ public class SearchActionIT { public void issue_with_comment_hidden() { UserDto john = db.users().insertUser(u -> u.setLogin("john").setName("John").setEmail("john@email.com")); UserDto fabrice = db.users().insertUser(u -> u.setLogin("fabrice").setName("Fabrice").setEmail("fabrice@email.com")); - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); indexPermissions(); ComponentDto file = db.components().insertComponent(newFileDto(project)); RuleDto rule = newIssueRule(); @@ -447,7 +447,7 @@ public class SearchActionIT { @Test public void load_additional_fields() { UserDto simon = db.users().insertUser(u -> u.setLogin("simon").setName("Simon").setEmail("simon@email.com")); - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); indexPermissions(); ComponentDto file = db.components().insertComponent(newFileDto(project)); RuleDto rule = newIssueRule(); @@ -465,7 +465,7 @@ public class SearchActionIT { UserDto simon = db.users().insertUser(u -> u.setLogin("simon").setName("Simon").setEmail("simon@email.com")); UserDto fabrice = db.users().insertUser(u -> u.setLogin("fabrice").setName("Fabrice").setEmail("fabrice@email.com")); - ComponentDto project = db.components().insertPublicProject("PROJECT_ID", c -> c.setKey("PROJECT_KEY").setLanguage("java")); + ComponentDto project = db.components().insertPublicProject("PROJECT_ID", c -> c.setKey("PROJECT_KEY").setLanguage("java")).getMainBranchComponent(); grantPermissionToAnyone(project, ISSUE_ADMIN); indexPermissions(); ComponentDto file = db.components().insertComponent(newFileDto(project, null, "FILE_ID").setKey("FILE_KEY").setLanguage("js")); @@ -488,7 +488,7 @@ public class SearchActionIT { @Test public void search_by_rule_key() { RuleDto rule = newIssueRule(); - ComponentDto project = db.components().insertPublicProject("PROJECT_ID", c -> c.setKey("PROJECT_KEY").setLanguage("java")); + ComponentDto project = db.components().insertPublicProject("PROJECT_ID", c -> c.setKey("PROJECT_KEY").setLanguage("java")).getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project, null, "FILE_ID").setKey("FILE_KEY").setLanguage("java")); db.issues().insertIssue(rule, project, file); @@ -509,7 +509,7 @@ public class SearchActionIT { @Test public void search_adhoc_issue_by_rule_key_returns_correct_rule_name() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); RuleDto rule = db.rules().insertIssueRule(RuleTesting.EXTERNAL_XOO, r -> r.setIsExternal(true) .setIsAdHoc(true) @@ -532,7 +532,7 @@ public class SearchActionIT { @Test public void search_by_non_existing_rule_key() { RuleDto rule = newIssueRule(); - ComponentDto project = db.components().insertPublicProject("PROJECT_ID", c -> c.setKey("PROJECT_KEY").setLanguage("java")); + ComponentDto project = db.components().insertPublicProject("PROJECT_ID", c -> c.setKey("PROJECT_KEY").setLanguage("java")).getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project, null, "FILE_ID").setKey("FILE_KEY").setLanguage("java")); db.issues().insertIssue(rule, project, file); @@ -553,7 +553,7 @@ public class SearchActionIT { @Test public void issue_on_removed_file() { RuleDto rule = newIssueRule(); - ComponentDto project = db.components().insertPublicProject("PROJECT_ID", c -> c.setKey("PROJECT_KEY").setKey("PROJECT_KEY")); + ComponentDto project = db.components().insertPublicProject("PROJECT_ID", c -> c.setKey("PROJECT_KEY").setKey("PROJECT_KEY")).getMainBranchComponent(); indexPermissions(); ComponentDto removedFile = db.components().insertComponent(newFileDto(project).setUuid("REMOVED_FILE_ID") .setKey("REMOVED_FILE_KEY") @@ -578,7 +578,7 @@ public class SearchActionIT { @Test public void apply_paging_with_one_component() { RuleDto rule = newIssueRule(); - ComponentDto project = db.components().insertPublicProject("PROJECT_ID", c -> c.setKey("PROJECT_KEY").setKey("PROJECT_KEY")); + ComponentDto project = db.components().insertPublicProject("PROJECT_ID", c -> c.setKey("PROJECT_KEY").setKey("PROJECT_KEY")).getMainBranchComponent(); indexPermissions(); ComponentDto file = db.components().insertComponent(newFileDto(project, null, "FILE_ID").setKey("FILE_KEY")); for (int i = 0; i < SearchOptions.MAX_PAGE_SIZE + 1; i++) { @@ -596,7 +596,7 @@ public class SearchActionIT { public void filter_by_assigned_to_me() { UserDto john = db.users().insertUser(u -> u.setLogin("john").setName("John").setEmail("john@email.com")); UserDto alice = db.users().insertUser(u -> u.setLogin("alice").setName("Alice").setEmail("alice@email.com")); - ComponentDto project = db.components().insertPublicProject(c -> c.setUuid("PROJECT_ID").setKey("PROJECT_KEY").setBranchUuid("PROJECT_ID")); + ComponentDto project = db.components().insertPublicProject(c -> c.setUuid("PROJECT_ID").setKey("PROJECT_KEY").setBranchUuid("PROJECT_ID")).getMainBranchComponent(); indexPermissions(); ComponentDto file = db.components().insertComponent(newFileDto(project, null, "FILE_ID").setKey("FILE_KEY")); RuleDto rule = newIssueRule(); @@ -642,7 +642,7 @@ public class SearchActionIT { public void filter_by_new_code_period() { UserDto john = db.users().insertUser(u -> u.setLogin("john").setName("John").setEmail("john@email.com")); UserDto alice = db.users().insertUser(u -> u.setLogin("alice").setName("Alice").setEmail("alice@email.com")); - ComponentDto project = db.components().insertPublicProject("PROJECT_ID", c -> c.setKey("PROJECT_KEY")); + ComponentDto project = db.components().insertPublicProject("PROJECT_ID", c -> c.setKey("PROJECT_KEY")).getMainBranchComponent(); SnapshotDto snapshotDto = db.components().insertSnapshot(project, s -> s.setLast(true).setPeriodDate(parseDateTime("2014-09-05T00:00:00+0100").getTime())); indexPermissions(); @@ -696,7 +696,7 @@ public class SearchActionIT { public void filter_by_leak_period_without_a_period() { UserDto john = db.users().insertUser(u -> u.setLogin("john").setName("John").setEmail("john@email.com")); UserDto alice = db.users().insertUser(u -> u.setLogin("alice").setName("Alice").setEmail("alice@email.com")); - ComponentDto project = db.components().insertPublicProject("PROJECT_ID", c -> c.setKey("PROJECT_KEY")); + ComponentDto project = db.components().insertPublicProject("PROJECT_ID", c -> c.setKey("PROJECT_KEY")).getMainBranchComponent(); SnapshotDto snapshotDto = db.components().insertSnapshot(project); indexPermissions(); ComponentDto file = db.components().insertComponent(newFileDto(project, null, "FILE_ID").setKey("FILE_KEY")); @@ -736,7 +736,7 @@ public class SearchActionIT { public void filter_by_leak_period_has_no_effect_on_prs() { UserDto john = db.users().insertUser(u -> u.setLogin("john").setName("John").setEmail("john@email.com")); UserDto alice = db.users().insertUser(u -> u.setLogin("alice").setName("Alice").setEmail("alice@email.com")); - ComponentDto project = db.components().insertPublicProject("PROJECT_ID", c -> c.setKey("PROJECT_KEY")); + ComponentDto project = db.components().insertPublicProject("PROJECT_ID", c -> c.setKey("PROJECT_KEY")).getMainBranchComponent(); ComponentDto pr = db.components().insertProjectBranch(project, b -> b.setBranchType(BranchType.PULL_REQUEST).setKey("pr")); SnapshotDto snapshotDto = db.components().insertSnapshot(pr); indexPermissions(); @@ -782,7 +782,7 @@ public class SearchActionIT { public void return_empty_when_login_is_unknown() { UserDto john = db.users().insertUser(u -> u.setLogin("john").setName("John").setEmail("john@email.com")); UserDto alice = db.users().insertUser(u -> u.setLogin("alice").setName("Alice").setEmail("alice@email.com")); - ComponentDto project = db.components().insertPublicProject("PROJECT_ID", c -> c.setKey("PROJECT_KEY")); + ComponentDto project = db.components().insertPublicProject("PROJECT_ID", c -> c.setKey("PROJECT_KEY")).getMainBranchComponent(); indexPermissions(); ComponentDto file = db.components().insertComponent(newFileDto(project, null, "FILE_ID").setKey("FILE_KEY")); RuleDto rule = newIssueRule(); @@ -831,7 +831,7 @@ public class SearchActionIT { userSession.logIn(poy); UserDto alice = db.users().insertUser(u -> u.setLogin("alice").setName("Alice").setEmail("alice@email.com")); UserDto john = db.users().insertUser(u -> u.setLogin("john").setName("John").setEmail("john@email.com")); - ComponentDto project = db.components().insertPublicProject("PROJECT_ID", c -> c.setKey("PROJECT_KEY")); + ComponentDto project = db.components().insertPublicProject("PROJECT_ID", c -> c.setKey("PROJECT_KEY")).getMainBranchComponent(); indexPermissions(); ComponentDto file = db.components().insertComponent(newFileDto(project, null, "FILE_ID").setKey("FILE_KEY")); RuleDto rule = newIssueRule(); @@ -860,7 +860,7 @@ public class SearchActionIT { @Test public void search_by_author() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); RuleDto rule = db.rules().insertIssueRule(); IssueDto issue1 = db.issues().insertIssue(rule, project, file, i -> i.setAuthorLogin("leia")); @@ -892,7 +892,7 @@ public class SearchActionIT { @Test public void filter_by_test_scope() { - ComponentDto project = db.components().insertPublicProject("PROJECT_ID", c -> c.setKey("PROJECT_KEY")); + ComponentDto project = db.components().insertPublicProject("PROJECT_ID", c -> c.setKey("PROJECT_KEY")).getMainBranchComponent(); indexPermissions(); ComponentDto mainCodeFile = db.components().insertComponent( newFileDto(project, null, "FILE_ID").setKey("FILE_KEY")); @@ -933,7 +933,7 @@ public class SearchActionIT { @Test public void filter_by_main_scope() { - ComponentDto project = db.components().insertPublicProject("PROJECT_ID", c -> c.setKey("PROJECT_KEY")); + ComponentDto project = db.components().insertPublicProject("PROJECT_ID", c -> c.setKey("PROJECT_KEY")).getMainBranchComponent(); indexPermissions(); ComponentDto mainCodeFile = db.components().insertComponent( newFileDto(project, null, "FILE_ID").setKey("FILE_KEY")); @@ -974,7 +974,7 @@ public class SearchActionIT { @Test public void filter_by_scope_always_returns_all_scope_facet_values() { - ComponentDto project = db.components().insertPublicProject("PROJECT_ID", c -> c.setKey("PROJECT_KEY")); + ComponentDto project = db.components().insertPublicProject("PROJECT_ID", c -> c.setKey("PROJECT_KEY")).getMainBranchComponent(); indexPermissions(); ComponentDto mainCodeFile = db.components().insertComponent( newFileDto(project, null, "FILE_ID").setKey("FILE_KEY")); @@ -1007,7 +1007,7 @@ public class SearchActionIT { @Test public void sort_by_updated_at() { RuleDto rule = newIssueRule(); - ComponentDto project = db.components().insertPublicProject("PROJECT_ID", c -> c.setKey("PROJECT_KEY")); + ComponentDto project = db.components().insertPublicProject("PROJECT_ID", c -> c.setKey("PROJECT_KEY")).getMainBranchComponent(); indexPermissions(); ComponentDto file = db.components().insertComponent(newFileDto(project, null, "FILE_ID").setKey("FILE_KEY")); dbClient.issueDao().insert(session, newIssue(rule, project, file) @@ -1036,7 +1036,7 @@ public class SearchActionIT { @Test public void only_vulnerabilities_are_returned_by_owaspAsvs40() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); Consumer ruleConsumer = ruleDefinitionDto -> ruleDefinitionDto .setSecurityStandards(Sets.newHashSet("cwe:20", "owaspTop10:a1", "pciDss-3.2:6.5.3", "owaspAsvs-4.0:12.3.1")) @@ -1069,7 +1069,7 @@ public class SearchActionIT { @Test public void only_vulnerabilities_are_returned_by_owaspAsvs40_with_level() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); Consumer issueConsumer = issueDto -> issueDto.setTags(Sets.newHashSet("bad-practice", "cwe", "owasp-a1", "sans-top25-insecure", "sql")); RuleDto issueRule1 = db.rules().insertIssueRule(r -> r.setSecurityStandards(Set.of("owaspAsvs-4.0:1.7.2", "owaspAsvs-4.0:12.3.1"))); @@ -1118,7 +1118,7 @@ public class SearchActionIT { @Test public void only_vulnerabilities_are_returned_by_pciDss32() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); Consumer ruleConsumer = ruleDefinitionDto -> ruleDefinitionDto .setSecurityStandards(Sets.newHashSet("cwe:20", "owaspTop10:a1", "pciDss-3.2:6.5.3", "pciDss-3.2:10.1")) @@ -1151,7 +1151,7 @@ public class SearchActionIT { @Test public void multiple_categories_pciDss32() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); // Rule 1 @@ -1236,7 +1236,7 @@ public class SearchActionIT { @Test public void only_vulnerabilities_are_returned_by_pciDss40() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); Consumer ruleConsumer = ruleDefinitionDto -> ruleDefinitionDto .setSecurityStandards(Sets.newHashSet("cwe:20", "owaspTop10:a1", "pciDss-4.0:6.5.3", "pciDss-4.0:10.1")) @@ -1269,7 +1269,7 @@ public class SearchActionIT { @Test public void multiple_categories_pciDss40() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); // Rule 1 @@ -1346,7 +1346,7 @@ public class SearchActionIT { @Test public void only_vulnerabilities_are_returned_by_cwe() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); Consumer ruleConsumer = ruleDefinitionDto -> ruleDefinitionDto .setSecurityStandards(Sets.newHashSet("cwe:20", "cwe:564", "cwe:89", "cwe:943", "owaspTop10:a1")) @@ -1371,7 +1371,7 @@ public class SearchActionIT { @Test public void only_vulnerabilities_are_returned_by_owasp() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); Consumer ruleConsumer = ruleDefinitionDto -> ruleDefinitionDto .setSecurityStandards(Sets.newHashSet("cwe:20", "cwe:564", "cwe:89", "cwe:943", "owaspTop10:a1", "owaspTop10-2021:a2")) @@ -1396,7 +1396,7 @@ public class SearchActionIT { @Test public void only_vulnerabilities_are_returned_by_owasp_2021() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); Consumer ruleConsumer = ruleDefinitionDto -> ruleDefinitionDto .setSecurityStandards(Sets.newHashSet("cwe:20", "cwe:564", "cwe:89", "cwe:943", "owaspTop10:a1", "owaspTop10-2021:a2")) @@ -1421,7 +1421,7 @@ public class SearchActionIT { @Test public void only_vulnerabilities_are_returned_by_sansTop25() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); Consumer ruleConsumer = ruleDefinitionDto -> ruleDefinitionDto .setSecurityStandards(Sets.newHashSet("cwe:266", "cwe:732", "owaspTop10:a5")) @@ -1446,7 +1446,7 @@ public class SearchActionIT { @Test public void only_vulnerabilities_are_returned_by_sonarsource_security() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); Consumer ruleConsumer = ruleDefinitionDto -> ruleDefinitionDto .setSecurityStandards(Sets.newHashSet("cwe:20", "cwe:564", "cwe:89", "cwe:943", "owaspTop10:a1")) @@ -1471,7 +1471,7 @@ public class SearchActionIT { @Test public void security_hotspots_are_not_returned_by_default() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); RuleDto rule = db.rules().insertIssueRule(); db.issues().insertIssue(rule, project, file, i -> i.setType(RuleType.BUG)); @@ -1489,7 +1489,7 @@ public class SearchActionIT { @Test public void security_hotspots_are_not_returned_by_issues_param() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); RuleDto issueRule = db.rules().insertIssueRule(); IssueDto bugIssue = db.issues().insertIssue(issueRule, project, file, i -> i.setType(RuleType.BUG)); @@ -1510,7 +1510,7 @@ public class SearchActionIT { @Test public void security_hotspots_are_not_returned_by_cwe() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); Consumer ruleConsumer = ruleDefinitionDto -> ruleDefinitionDto .setSecurityStandards(Sets.newHashSet("cwe:20", "cwe:564", "cwe:89", "cwe:943", "owaspTop10:a1")) @@ -1536,7 +1536,7 @@ public class SearchActionIT { @Test public void security_hotspots_are_not_returned_by_assignees() { UserDto user = db.users().insertUser(); - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); RuleDto hotspotRule = db.rules().insertHotspotRule(); db.issues().insertHotspot(hotspotRule, project, file, issueDto -> issueDto.setAssigneeUuid(user.getUuid())); @@ -1559,7 +1559,7 @@ public class SearchActionIT { @Test public void security_hotspots_are_not_returned_by_rule() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); RuleDto hotspotRule = db.rules().insertHotspotRule(); db.issues().insertHotspot(hotspotRule, project, file); @@ -1574,7 +1574,7 @@ public class SearchActionIT { @Test public void security_hotspots_are_not_returned_by_issues_param_only() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); RuleDto rule = db.rules().insertHotspotRule(); List hotspots = IntStream.range(1, 2 + new Random().nextInt(10)) @@ -1593,7 +1593,7 @@ public class SearchActionIT { @Test public void fail_if_trying_to_filter_issues_by_hotspots() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); RuleDto hotspotRule = newHotspotRule(); db.issues().insertHotspot(hotspotRule, project, file); @@ -1610,7 +1610,7 @@ public class SearchActionIT { @Test public void security_hotspot_are_ignored_when_filtering_by_severities() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); RuleDto issueRule = db.rules().insertIssueRule(); IssueDto bugIssue = db.issues().insertIssue(issueRule, project, file, i -> i.setType(RuleType.BUG).setSeverity(Severity.MAJOR.name())); @@ -1672,7 +1672,7 @@ public class SearchActionIT { @Test public void paging() { RuleDto rule = newIssueRule(); - ComponentDto project = db.components().insertPublicProject("PROJECT_ID", c -> c.setKey("PROJECT_KEY")); + ComponentDto project = db.components().insertPublicProject("PROJECT_ID", c -> c.setKey("PROJECT_KEY")).getMainBranchComponent(); indexPermissions(); ComponentDto file = db.components().insertComponent(newFileDto(project, null, "FILE_ID").setKey("FILE_KEY")); for (int i = 0; i < 12; i++) { @@ -1861,7 +1861,7 @@ public class SearchActionIT { UserDto john = db.users().insertUser(); userSession.logIn(john); RuleDto rule = db.rules().insertIssueRule(); - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); for (Consumer populator : populators) { db.issues().insertIssue(rule, project, file, populator); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/issue/ws/SetSeverityActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/issue/ws/SetSeverityActionIT.java index da093be6a6d..22f778dbafe 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/issue/ws/SetSeverityActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/issue/ws/SetSeverityActionIT.java @@ -123,7 +123,7 @@ public class SetSeverityActionIT { @Test public void set_severity_is_not_distributed_for_pull_request() { RuleDto rule = dbTester.rules().insertIssueRule(); - ComponentDto project = dbTester.components().insertPrivateProject(); + ComponentDto project = dbTester.components().insertPrivateProject().getMainBranchComponent(); ComponentDto pullRequest = dbTester.components().insertProjectBranch(project, b -> b.setKey("myBranch1") .setBranchType(BranchType.PULL_REQUEST) diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/issue/ws/SetTagsActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/issue/ws/SetTagsActionIT.java index 91fe304f370..16af4cabf5e 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/issue/ws/SetTagsActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/issue/ws/SetTagsActionIT.java @@ -196,7 +196,7 @@ public class SetTagsActionIT { @Test public void fail_when_security_hotspot() { RuleDto rule = db.rules().insertHotspotRule(); - ComponentDto project = db.components().insertPublicProject(newPublicProjectDto()); + ComponentDto project = db.components().insertPublicProject(newPublicProjectDto()).getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); IssueDto issueDto = db.issues().insertHotspot(rule, project, file); logIn(issueDto); @@ -228,7 +228,7 @@ public class SetTagsActionIT { @SafeVarargs private final IssueDto insertIssueForPublicProject(Consumer... consumers) { RuleDto rule = db.rules().insertIssueRule(); - ComponentDto project = db.components().insertPublicProject(newPublicProjectDto()); + ComponentDto project = db.components().insertPublicProject(newPublicProjectDto()).getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); return db.issues().insertIssue(rule, project, file, consumers); } diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/issue/ws/SetTypeActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/issue/ws/SetTypeActionIT.java index dd71ecfad5d..735b6373632 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/issue/ws/SetTypeActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/issue/ws/SetTypeActionIT.java @@ -141,7 +141,7 @@ public class SetTypeActionIT { @Test public void set_type_is_not_distributed_for_pull_request() { RuleDto rule = dbTester.rules().insertIssueRule(); - ComponentDto project = dbTester.components().insertPrivateProject(); + ComponentDto project = dbTester.components().insertPrivateProject().getMainBranchComponent(); ComponentDto pullRequest = dbTester.components().insertProjectBranch(project, b -> b.setKey("myBranch1") .setBranchType(BranchType.PULL_REQUEST) @@ -256,7 +256,7 @@ public class SetTypeActionIT { private IssueDto newIssueWithProject(RuleType type) { RuleDto rule = dbTester.rules().insert(); - ComponentDto project = dbTester.components().insertPrivateProject(); + ComponentDto project = dbTester.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = dbTester.components().insertComponent(newFileDto(project)); return issueDbTester.insert(rule, project, file, i -> i.setType(type)); } diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/issue/ws/TagsActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/issue/ws/TagsActionIT.java index 464fe9bbc97..5cf06174b75 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/issue/ws/TagsActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/issue/ws/TagsActionIT.java @@ -81,7 +81,7 @@ public class TagsActionIT { @Test public void search_tags() { RuleDto rule = db.rules().insertIssueRule(); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); db.issues().insertIssue(rule, project, project, issue -> issue.setTags(asList("tag1", "tag2"))); db.issues().insertIssue(rule, project, project, issue -> issue.setTags(asList("tag3", "tag4", "tag5"))); indexIssues(); @@ -95,7 +95,7 @@ public class TagsActionIT { @Test public void search_tags_ignores_hotspots() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); RuleDto issueRule = db.rules().insertIssueRule(); RuleDto hotspotRule = db.rules().insertHotspotRule(); Consumer setTags = issue -> issue.setTags(asList("tag1", "tag2")); @@ -111,7 +111,7 @@ public class TagsActionIT { @Test public void search_tags_by_query() { RuleDto rule = db.rules().insertIssueRule(); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); db.issues().insertIssue(rule, project, project, issue -> issue.setTags(asList("tag1", "tag2"))); db.issues().insertIssue(rule, project, project, issue -> issue.setTags(asList("tag12", "tag4", "tag5"))); indexIssues(); @@ -124,7 +124,7 @@ public class TagsActionIT { public void search_tags_by_query_ignores_hotspots() { RuleDto issueRule = db.rules().insertIssueRule(); RuleDto hotspotRule = db.rules().insertHotspotRule(); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); db.issues().insertIssue(issueRule, project, project, issue -> issue.setTags(asList("tag1", "tag2"))); db.issues().insertHotspot(hotspotRule, project, project, issue -> issue.setTags(asList("tag1", "tag12", "tag4", "tag5"))); indexIssues(); @@ -142,8 +142,8 @@ public class TagsActionIT { @Test public void search_tags_by_project() { RuleDto rule = db.rules().insertIssueRule(); - ComponentDto project1 = db.components().insertPrivateProject(); - ComponentDto project2 = db.components().insertPrivateProject(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); db.issues().insertIssue(rule, project1, project1, issue -> issue.setTags(singletonList("tag1"))); db.issues().insertIssue(rule, project2, project2, issue -> issue.setTags(singletonList("tag2"))); indexIssues(); @@ -157,7 +157,7 @@ public class TagsActionIT { @Test public void search_tags_by_branch_equals_main_branch() { RuleDto rule = db.rules().insertIssueRule(); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto branch = db.components().insertProjectBranch(project, b -> b.setKey("my_branch")); db.issues().insertIssue(rule, project, project, issue -> issue.setTags(asList("tag1", "tag2"))); db.issues().insertIssue(rule, branch, branch, issue -> issue.setTags(asList("tag12", "tag4", "tag5"))); @@ -172,7 +172,7 @@ public class TagsActionIT { @Test public void search_tags_by_branch() { RuleDto rule = db.rules().insertIssueRule(); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto branch = db.components().insertProjectBranch(project, b -> b.setKey("my_branch")); db.issues().insertIssue(rule, project, project, issue -> issue.setTags(asList("tag1", "tag2"))); db.issues().insertIssue(rule, branch, branch, issue -> issue.setTags(asList("tag12", "tag4", "tag5"))); @@ -187,7 +187,7 @@ public class TagsActionIT { @Test public void search_tags_by_branch_not_exist_fall_back_to_main_branch() { RuleDto rule = db.rules().insertIssueRule(); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto branch = db.components().insertProjectBranch(project, b -> b.setKey("my_branch")); db.issues().insertIssue(rule, project, project, issue -> issue.setTags(asList("tag1", "tag2"))); db.issues().insertIssue(rule, branch, branch, issue -> issue.setTags(asList("tag12", "tag4", "tag5"))); @@ -202,7 +202,7 @@ public class TagsActionIT { @Test public void search_all_tags_by_query() { RuleDto rule = db.rules().insertIssueRule(); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto branch = db.components().insertProjectBranch(project, b -> b.setKey("my_branch")); db.issues().insertIssue(rule, project, project, issue -> issue.setTags(asList("tag1", "tag2"))); db.issues().insertIssue(rule, branch, branch, issue -> issue.setTags(asList("tag12", "tag4", "tag5"))); @@ -218,8 +218,8 @@ public class TagsActionIT { public void search_tags_by_project_ignores_hotspots() { RuleDto issueRule = db.rules().insertIssueRule(); RuleDto hotspotRule = db.rules().insertHotspotRule(); - ComponentDto project1 = db.components().insertPrivateProject(); - ComponentDto project2 = db.components().insertPrivateProject(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); db.issues().insertHotspot(hotspotRule, project1, project1, issue -> issue.setTags(singletonList("tag1"))); db.issues().insertIssue(issueRule, project1, project1, issue -> issue.setTags(singletonList("tag2"))); db.issues().insertHotspot(hotspotRule, project2, project2, issue -> issue.setTags(singletonList("tag3"))); @@ -234,7 +234,7 @@ public class TagsActionIT { @Test public void search_tags_by_portfolio() { ComponentDto portfolio = db.components().insertPrivatePortfolio(); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); db.components().insertComponent(newProjectCopy(project, portfolio)); permissionIndexer.allowOnlyAnyone(project); RuleDto rule = db.rules().insertIssueRule(); @@ -248,7 +248,7 @@ public class TagsActionIT { @Test public void search_tags_by_portfolio_ignores_hotspots() { ComponentDto portfolio = db.components().insertPrivatePortfolio(); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); db.components().insertComponent(newProjectCopy(project, portfolio)); permissionIndexer.allowOnlyAnyone(project); RuleDto issueRule = db.rules().insertIssueRule(); @@ -263,8 +263,8 @@ public class TagsActionIT { @Test public void search_tags_by_application() { - ComponentDto application = db.components().insertPrivateApplication(); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto application = db.components().insertPrivateApplication().getMainBranchComponent(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); db.components().insertComponent(newProjectCopy(project, application)); permissionIndexer.allowOnlyAnyone(project); RuleDto rule = db.rules().insertIssueRule(); @@ -277,8 +277,8 @@ public class TagsActionIT { @Test public void search_tags_by_application_ignores_hotspots() { - ComponentDto application = db.components().insertPrivateApplication(); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto application = db.components().insertPrivateApplication().getMainBranchComponent(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); db.components().insertComponent(newProjectCopy(project, application)); permissionIndexer.allowOnlyAnyone(project); RuleDto issueRule = db.rules().insertIssueRule(); @@ -294,7 +294,7 @@ public class TagsActionIT { @Test public void return_limited_size() { RuleDto rule = db.rules().insertIssueRule(); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); db.issues().insertIssue(rule, project, project, issue -> issue.setTags(asList("tag1", "tag2"))); db.issues().insertIssue(rule, project, project, issue -> issue.setTags(asList("tag3", "tag4", "tag5"))); indexIssues(); @@ -310,8 +310,8 @@ public class TagsActionIT { @Test public void do_not_return_issues_without_permission() { RuleDto rule = db.rules().insertIssueRule(); - ComponentDto project1 = db.components().insertPrivateProject(); - ComponentDto project2 = db.components().insertPrivateProject(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); db.issues().insertIssue(rule, project1, project1, issue -> issue.setTags(asList("tag1", "tag2"))); db.issues().insertIssue(rule, project2, project2, issue -> issue.setTags(asList("tag3", "tag4", "tag5"))); indexIssues(); @@ -336,7 +336,7 @@ public class TagsActionIT { @Test public void fail_when_project_parameter_does_not_match_a_project() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); indexIssues(); permissionIndexer.allowOnlyAnyone(project, project); @@ -353,7 +353,7 @@ public class TagsActionIT { @Test public void json_example() { RuleDto rule = db.rules().insertIssueRule(); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); db.issues().insertIssue(rule, project, project, issue -> issue.setTags(asList("convention", "security"))); db.issues().insertIssue(rule, project, project, issue -> issue.setTags(singletonList("cwe"))); indexIssues(); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/measure/live/ComponentIndexFactoryIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/measure/live/ComponentIndexFactoryIT.java index 454f30625e4..07a22736fd7 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/measure/live/ComponentIndexFactoryIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/measure/live/ComponentIndexFactoryIT.java @@ -32,7 +32,7 @@ public class ComponentIndexFactoryIT { @Test public void creates_and_loads_instance() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentIndex index = factory.create(db.getSession(), List.of(project)); assertThat(index.getAllUuids()).containsOnly(project.uuid()); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/measure/live/ComponentIndexImplIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/measure/live/ComponentIndexImplIT.java index 84a15fc3d4e..cda533e6121 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/measure/live/ComponentIndexImplIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/measure/live/ComponentIndexImplIT.java @@ -50,7 +50,7 @@ public class ComponentIndexImplIT { @Before public void setUp() { - project = db.components().insertPrivateProject(); + project = db.components().insertPrivateProject().getMainBranchComponent(); dir1 = db.components().insertComponent(ComponentTesting.newDirectory(project, "src/main/java")); dir2 = db.components().insertComponent(ComponentTesting.newDirectory(project, "src/main/java2")); file11 = db.components().insertComponent(ComponentTesting.newFileDto(project, dir1)); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/measure/live/LiveMeasureComputerImplIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/measure/live/LiveMeasureComputerImplIT.java index 4a87018df46..e914ffcb6db 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/measure/live/LiveMeasureComputerImplIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/measure/live/LiveMeasureComputerImplIT.java @@ -84,7 +84,7 @@ public class LiveMeasureComputerImplIT { metric1 = db.measures().insertMetric(); metric2 = db.measures().insertMetric(); - project = db.components().insertPublicProject(); + project = db.components().insertPublicProject().getMainBranchComponent(); branch = db.getDbClient().branchDao().selectByUuid(db.getSession(), project.uuid()).get(); db.measures().insertLiveMeasure(project, metric2, lm -> lm.setValue(1d)); @@ -115,7 +115,7 @@ public class LiveMeasureComputerImplIT { public void refreshes_quality_gate() { SnapshotDto snapshot = markProjectAsAnalyzed(project); when(componentIndex.getAllUuids()).thenReturn(Set.of(project.uuid())); - when(qGateComputer.loadQualityGate(db.getSession(), db.components().getProjectDto(project), branch)).thenReturn(qualityGate); + when(qGateComputer.loadQualityGate(db.getSession(), db.components().getProjectDtoByMainBranch(project), branch)).thenReturn(qualityGate); liveMeasureComputer.refresh(db.getSession(), List.of(project)); @@ -136,7 +136,7 @@ public class LiveMeasureComputerImplIT { MetricDto alertStatusMetric = db.measures().insertMetric(m -> m.setKey(ALERT_STATUS_KEY)); db.measures().insertLiveMeasure(project, alertStatusMetric, lm -> lm.setData("OK")); - when(qGateComputer.loadQualityGate(db.getSession(), db.components().getProjectDto(project), branch)).thenReturn(qualityGate); + when(qGateComputer.loadQualityGate(db.getSession(), db.components().getProjectDtoByMainBranch(project), branch)).thenReturn(qualityGate); when(qGateComputer.refreshGateStatus(eq(project), eq(qualityGate), any(MeasureMatrix.class), eq(configuration))).thenReturn(newQualityGate); List qgChangeEvents = liveMeasureComputer.refresh(db.getSession(), List.of(project)); @@ -144,7 +144,7 @@ public class LiveMeasureComputerImplIT { assertThat(qgChangeEvents).hasSize(1); assertThat(qgChangeEvents.get(0).getBranch()).isEqualTo(branch); assertThat(qgChangeEvents.get(0).getAnalysis()).isEqualTo(snapshot); - assertThat(qgChangeEvents.get(0).getProject()).isEqualTo(db.components().getProjectDto(project)); + assertThat(qgChangeEvents.get(0).getProject()).isEqualTo(db.components().getProjectDtoByMainBranch(project)); assertThat(qgChangeEvents.get(0).getPreviousStatus()).contains(Metric.Level.OK); assertThat(qgChangeEvents.get(0).getProjectConfiguration()).isEqualTo(configuration); assertThat(qgChangeEvents.get(0).getQualityGateSupplier().get()).contains(newQualityGate); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/measure/live/LiveMeasureTreeUpdaterImplIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/measure/live/LiveMeasureTreeUpdaterImplIT.java index 7d1e1334009..b15953bf9c1 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/measure/live/LiveMeasureTreeUpdaterImplIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/measure/live/LiveMeasureTreeUpdaterImplIT.java @@ -41,8 +41,6 @@ import org.sonar.db.metric.MetricDto; import org.sonar.db.newcodeperiod.NewCodePeriodType; import org.sonar.db.rule.RuleDto; -import static java.util.Collections.emptyList; -import static java.util.Collections.emptySet; import static org.assertj.core.api.Assertions.assertThat; import static org.sonar.api.CoreProperties.RATING_GRID; import static org.sonar.api.measures.CoreMetrics.NEW_SECURITY_HOTSPOTS_KEY; @@ -74,7 +72,7 @@ public class LiveMeasureTreeUpdaterImplIT { @Before public void setUp() { // insert project and file structure - project = db.components().insertPrivateProject(); + project = db.components().insertPrivateProject().getMainBranchComponent(); branch = db.getDbClient().branchDao().selectByUuid(db.getSession(), project.uuid()).get(); dir = db.components().insertComponent(ComponentTesting.newDirectory(project, "src/main/java")); file1 = db.components().insertComponent(ComponentTesting.newFileDto(project, dir)); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/measure/live/LiveQualityGateComputerImplIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/measure/live/LiveQualityGateComputerImplIT.java index 708174c43ac..ce14f6cf144 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/measure/live/LiveQualityGateComputerImplIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/measure/live/LiveQualityGateComputerImplIT.java @@ -66,7 +66,7 @@ public class LiveQualityGateComputerImplIT { @Test public void loadQualityGate_returns_hardcoded_gate_for_pull_requests() { - ProjectDto project = db.components().insertPublicProjectDto(); + ProjectDto project = db.components().insertPublicProject().getProjectDto(); BranchDto branch = db.components().insertProjectBranch(project, b -> b.setBranchType(BranchType.PULL_REQUEST)); MetricDto metric1 = db.measures().insertMetric(m -> m.setKey("new_metric")); MetricDto metric2 = db.measures().insertMetric(m -> m.setKey("metric")); @@ -83,7 +83,7 @@ public class LiveQualityGateComputerImplIT { @Test public void loadQualityGate_on_branch_returns_default_gate() { - ProjectDto project = db.components().insertPublicProjectDto(); + ProjectDto project = db.components().insertPublicProject().getProjectDto(); BranchDto branch = db.components().insertProjectBranch(project).setBranchType(BranchType.BRANCH); MetricDto metric = db.measures().insertMetric(); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/measure/ws/ComponentActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/measure/ws/ComponentActionIT.java index 979374a67fd..5744a0c46c3 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/measure/ws/ComponentActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/measure/ws/ComponentActionIT.java @@ -88,7 +88,7 @@ public class ComponentActionIT { @Test public void provided_project() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(USER, project); MetricDto metric = db.measures().insertMetric(m -> m.setValueType("INT")); @@ -101,7 +101,7 @@ public class ComponentActionIT { @Test public void without_additional_fields() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(USER, project); db.components().insertSnapshot(project); MetricDto metric = db.measures().insertMetric(m -> m.setValueType("INT")); @@ -118,7 +118,7 @@ public class ComponentActionIT { @Test public void branch() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(USER, project); String branchName = "my_branch"; ComponentDto branch = db.components().insertProjectBranch(project, b -> b.setKey(branchName)); @@ -143,7 +143,7 @@ public class ComponentActionIT { @Test public void branch_not_set_if_main_branch() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(USER, project); ComponentDto file = db.components().insertComponent(newFileDto(project)); MetricDto complexity = db.measures().insertMetric(m1 -> m1.setKey("complexity").setValueType("INT")); @@ -160,7 +160,7 @@ public class ComponentActionIT { @Test public void pull_request() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(USER, project); ComponentDto branch = db.components().insertProjectBranch(project, b -> b.setKey("pr-123").setBranchType(PULL_REQUEST)); userSession.addProjectBranchMapping(project.uuid(), branch); @@ -184,7 +184,7 @@ public class ComponentActionIT { @Test public void new_issue_count_measures_are_transformed_in_pr() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(USER, project); ComponentDto branch = db.components().insertProjectBranch(project, b -> b.setKey("pr-123").setBranchType(PULL_REQUEST)); userSession.addProjectBranchMapping(project.uuid(), branch); @@ -222,7 +222,7 @@ public class ComponentActionIT { @Test public void new_issue_count_measures_are_not_transformed_if_they_dont_exist_in_pr() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(USER, project); ComponentDto branch = db.components().insertProjectBranch(project, b -> b.setKey("pr-123").setBranchType(PULL_REQUEST)); userSession.addProjectBranchMapping(project.uuid(), branch); @@ -245,7 +245,7 @@ public class ComponentActionIT { @Test public void reference_key_in_the_response() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto view = db.components().insertPrivatePortfolio(); userSession.addProjectPermission(USER, view); db.components().insertSnapshot(view); @@ -259,7 +259,7 @@ public class ComponentActionIT { @Test public void use_deprecated_component_id_parameter() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(USER, project); userSession.addProjectPermission(USER, project); MetricDto metric = db.measures().insertMetric(m -> m.setValueType("INT")); @@ -274,7 +274,7 @@ public class ComponentActionIT { @Test public void metric_without_a_domain() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(USER, project); MetricDto metricWithoutDomain = db.measures().insertMetric(m -> m .setValueType("INT") @@ -295,7 +295,7 @@ public class ComponentActionIT { @Test public void use_best_values() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); userSession.addProjectPermission(USER, project); MetricDto metric = db.measures().insertMetric(m -> m @@ -317,7 +317,7 @@ public class ComponentActionIT { @Test public void fail_when_a_metric_is_not_found() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(USER, project); db.components().insertSnapshot(project); db.measures().insertMetric(m -> m.setKey("ncloc").setValueType("INT")); @@ -330,7 +330,7 @@ public class ComponentActionIT { @Test public void fail_when_empty_metric_keys_parameter() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(USER, project); db.components().insertSnapshot(project); @@ -342,7 +342,7 @@ public class ComponentActionIT { @Test public void fail_when_not_enough_permission() { userSession.logIn(); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); db.components().insertSnapshot(project); MetricDto metric = db.measures().insertMetric(m -> m.setValueType("INT")); @@ -366,7 +366,7 @@ public class ComponentActionIT { @Test public void fail_when_component_is_removed() { - ComponentDto project = db.components().insertPrivateProject(p -> p.setEnabled(false)); + ComponentDto project = db.components().insertPrivateProject(p -> p.setEnabled(false)).getMainBranchComponent(); userSession.addProjectPermission(USER, project); userSession.addProjectPermission(USER, project); MetricDto metric = db.measures().insertMetric(m -> m.setValueType("INT")); @@ -383,7 +383,7 @@ public class ComponentActionIT { @Test public void fail_if_branch_does_not_exist() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); userSession.addProjectPermission(USER, project); db.components().insertProjectBranch(project, b -> b.setKey("my_branch")); @@ -401,7 +401,7 @@ public class ComponentActionIT { @Test public void json_example() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(USER, project); SnapshotDto analysis = db.components().insertSnapshot(project, s -> s.setPeriodDate(parseDateTime("2016-01-11T10:49:50+0100").getTime()) diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/measure/ws/ComponentTreeActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/measure/ws/ComponentTreeActionIT.java index 7b0c0e6db2d..70b99ddff61 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/measure/ws/ComponentTreeActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/measure/ws/ComponentTreeActionIT.java @@ -123,7 +123,7 @@ public class ComponentTreeActionIT { @Test public void json_example() { ComponentDto project = db.components().insertPrivateProject(p -> p.setKey("MY_PROJECT") - .setName("My Project")); + .setName("My Project")).getMainBranchComponent(); userSession.addProjectPermission(USER, project); SnapshotDto analysis = db.components().insertSnapshot(project, s -> s.setPeriodDate(parseDateTime("2016-01-11T10:49:50+0100").getTime()) .setPeriodMode("previous_version") @@ -176,7 +176,7 @@ public class ComponentTreeActionIT { @Test public void empty_response() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(USER, project); ComponentTreeWsResponse response = ws.newRequest() @@ -192,7 +192,7 @@ public class ComponentTreeActionIT { @Test public void load_measures_and_periods() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); SnapshotDto projectSnapshot = dbClient.snapshotDao().insert(dbSession, newAnalysis(project) .setPeriodDate(System.currentTimeMillis()) @@ -226,7 +226,7 @@ public class ComponentTreeActionIT { @Test public void load_measures_with_best_value() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); SnapshotDto projectSnapshot = db.components().insertSnapshot(project); userSession.anonymous().addProjectPermission(USER, project); ComponentDto directory = newDirectory(project, "directory-uuid", "path/to/directory").setName("directory-1"); @@ -272,7 +272,7 @@ public class ComponentTreeActionIT { @Test public void return_is_best_value_on_leak_measures() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); db.components().insertSnapshot(project); userSession.anonymous().addProjectPermission(USER, project); ComponentDto file = newFileDto(project); @@ -314,7 +314,7 @@ public class ComponentTreeActionIT { @Test public void use_best_value_for_rating() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.anonymous().addProjectPermission(USER, project); SnapshotDto projectSnapshot = dbClient.snapshotDao().insert(dbSession, newAnalysis(project) .setPeriodDate(parseDateTime("2016-01-11T10:49:50+0100").getTime()) @@ -348,7 +348,7 @@ public class ComponentTreeActionIT { @Test public void load_measures_multi_sort_with_metric_key_and_paginated() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(USER, project); SnapshotDto projectSnapshot = db.components().insertSnapshot(project); ComponentDto file9 = db.components().insertComponent(newFileDto(project, null, "file-uuid-9").setName("file-1").setKey("file-9-key")); @@ -391,7 +391,7 @@ public class ComponentTreeActionIT { @Test public void sort_by_metric_value() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(USER, project); SnapshotDto projectSnapshot = db.components().insertSnapshot(project); ComponentDto file4 = db.components().insertComponent(newFileDto(project, null, "file-uuid-4").setKey("file-4-key")); @@ -418,7 +418,7 @@ public class ComponentTreeActionIT { @Test public void remove_components_without_measure_on_the_metric_sort() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(USER, project); SnapshotDto projectSnapshot = db.components().insertSnapshot(project); ComponentDto file1 = newFileDto(project, null, "file-uuid-1").setKey("file-1-key"); @@ -452,7 +452,7 @@ public class ComponentTreeActionIT { @Test public void sort_by_metric_period() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(USER, project); SnapshotDto projectSnapshot = db.components().insertSnapshot(project); ComponentDto file3 = db.components().insertComponent(newFileDto(project, null, "file-uuid-3").setKey("file-3-key")); @@ -478,7 +478,7 @@ public class ComponentTreeActionIT { @Test public void remove_components_without_measure_on_the_metric_period_sort() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(USER, project); SnapshotDto projectSnapshot = db.components().insertSnapshot(project); ComponentDto file4 = db.components().insertComponent(newFileDto(project, null, "file-uuid-4").setKey("file-4-key")); @@ -509,7 +509,7 @@ public class ComponentTreeActionIT { @Test public void load_measures_when_no_leave_qualifier() { resourceTypes.setLeavesQualifiers(); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(USER, project); db.components().insertSnapshot(project); db.components().insertComponent(newFileDto(project)); @@ -527,7 +527,7 @@ public class ComponentTreeActionIT { @Test public void branch() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(USER, project); String branchName = "my-branch"; ComponentDto branch = db.components().insertProjectBranch(project, b -> b.setKey(branchName)); @@ -552,7 +552,7 @@ public class ComponentTreeActionIT { @Test public void dont_show_branch_if_main_branch() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(USER, project); ComponentDto file = db.components().insertComponent(newFileDto(project)); MetricDto complexity = db.measures().insertMetric(m -> m.setValueType(INT.name())); @@ -569,7 +569,7 @@ public class ComponentTreeActionIT { @Test public void show_branch_on_empty_response_if_not_main_branch() { - ComponentDto mainProjectBranch = db.components().insertPrivateProject(); + ComponentDto mainProjectBranch = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(USER, mainProjectBranch); ComponentDto branch = db.components().insertProjectBranch(mainProjectBranch, b -> b.setKey("develop")); userSession.addProjectBranchMapping(mainProjectBranch.uuid(), branch); @@ -589,7 +589,7 @@ public class ComponentTreeActionIT { @Test public void pull_request() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(USER, project); ComponentDto branch = db.components().insertProjectBranch(project, b -> b.setKey("pr-123").setBranchType(PULL_REQUEST)); userSession.addProjectBranchMapping(project.uuid(), branch); @@ -613,7 +613,7 @@ public class ComponentTreeActionIT { @Test public void fix_pull_request_new_issue_count_metrics() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(USER, project); ComponentDto branch = db.components().insertProjectBranch(project, b -> b.setKey("pr-123").setBranchType(PULL_REQUEST)); userSession.addProjectBranchMapping(project.uuid(), branch); @@ -643,7 +643,7 @@ public class ComponentTreeActionIT { @Test public void new_issue_count_measures_are_not_transformed_if_they_dont_exist_in_pr() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(USER, project); ComponentDto pr = db.components().insertProjectBranch(project, b -> b.setKey("pr").setBranchType(PULL_REQUEST)); userSession.addProjectBranchMapping(project.uuid(), pr); @@ -666,7 +666,7 @@ public class ComponentTreeActionIT { @Test public void metric_without_a_domain() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(USER, project); SnapshotDto analysis = db.getDbClient().snapshotDao().insert(dbSession, newAnalysis(project)); MetricDto metricWithoutDomain = db.measures().insertMetric(m -> m @@ -688,7 +688,7 @@ public class ComponentTreeActionIT { @Test public void project_reference_from_portfolio() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(USER, project); ComponentDto view = db.components().insertPrivatePortfolio(); userSession.addProjectPermission(USER, view); @@ -736,7 +736,7 @@ public class ComponentTreeActionIT { .setKey("Apache-Projects").setName("Apache Projects").setPrivate(true); userSession.addProjectPermission(USER, apache_projects); ComponentDto view = db.components().insertComponent(apache_projects); - ComponentDto application = db.components().insertPrivateApplication(); + ComponentDto application = db.components().insertPrivateApplication().getMainBranchComponent(); userSession.addProjectPermission(USER, application); ComponentDto localView = db.components().insertComponent( ComponentTesting.newSubPortfolio(view, "SUB-VIEW-UUID", "All-Projects").setName("All projects").setCopyComponentUuid(application.uuid())); @@ -757,12 +757,12 @@ public class ComponentTreeActionIT { @Test public void project_branch_reference_from_application_branch() { MetricDto ncloc = insertNclocMetric(); - ComponentDto application = db.components().insertPublicProject(c -> c.setQualifier(APP).setKey("app-key")); + ComponentDto application = db.components().insertPublicProject(c -> c.setQualifier(APP).setKey("app-key")).getMainBranchComponent(); userSession.registerApplication(application); String branchName = "app-branch"; ComponentDto applicationBranch = db.components().insertProjectBranch(application, a -> a.setKey(branchName), a -> a.setUuid("custom-uuid")); userSession.addProjectBranchMapping(application.uuid(), applicationBranch); - ComponentDto project = db.components().insertPrivateProject(p -> p.setKey("project-key")); + ComponentDto project = db.components().insertPrivateProject(p -> p.setKey("project-key")).getMainBranchComponent(); ComponentDto projectBranch = db.components().insertProjectBranch(project, b -> b.setKey("project-branch")); userSession.addProjectBranchMapping(project.uuid(), projectBranch); @@ -789,7 +789,7 @@ public class ComponentTreeActionIT { @Test public void fail_when_metric_keys_parameter_is_empty() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); db.components().insertSnapshot(project); assertThatThrownBy(() -> { @@ -804,7 +804,7 @@ public class ComponentTreeActionIT { @Test public void fail_when_a_metric_is_not_found() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(USER, project); db.components().insertSnapshot(project); insertNclocMetric(); @@ -821,7 +821,7 @@ public class ComponentTreeActionIT { @Test public void fail_when_using_DISTRIB_metrics() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(USER, project); db.components().insertSnapshot(project); dbClient.metricDao().insert(dbSession, newMetricDto().setKey("distrib1").setValueType(DISTRIB.name())); @@ -840,7 +840,7 @@ public class ComponentTreeActionIT { @Test public void fail_when_using_DATA_metrics() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(USER, project); db.components().insertSnapshot(project); @@ -860,7 +860,7 @@ public class ComponentTreeActionIT { @Test public void fail_when_setting_more_than_15_metric_keys() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); db.components().insertSnapshot(project); List metrics = IntStream.range(0, 20) .mapToObj(i -> "metric" + i) @@ -879,7 +879,7 @@ public class ComponentTreeActionIT { @Test public void fail_when_search_query_have_less_than_3_characters() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); db.components().insertSnapshot(project); insertNclocMetric(); insertNewViolationsMetric(); @@ -898,7 +898,7 @@ public class ComponentTreeActionIT { @Test public void fail_when_insufficient_privileges() { userSession.logIn(); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); db.components().insertSnapshot(project); var request = ws.newRequest() @@ -911,9 +911,9 @@ public class ComponentTreeActionIT { @Test public void fail_when_app_with_insufficient_privileges_for_projects() { userSession.logIn(); - ComponentDto app = db.components().insertPrivateApplication(); - ComponentDto project1 = db.components().insertPrivateProject(); - ComponentDto project2 = db.components().insertPrivateProject(); + ComponentDto app = db.components().insertPrivateApplication().getMainBranchComponent(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); db.components().insertSnapshot(app); userSession.registerApplication( @@ -932,7 +932,7 @@ public class ComponentTreeActionIT { @Test public void fail_when_sort_by_metric_and_no_metric_sort_provided() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); db.components().insertSnapshot(project); assertThatThrownBy(() -> { @@ -949,7 +949,7 @@ public class ComponentTreeActionIT { @Test public void fail_when_sort_by_metric_and_not_in_the_list_of_metric_keys() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); db.components().insertSnapshot(project); assertThatThrownBy(() -> { @@ -966,7 +966,7 @@ public class ComponentTreeActionIT { @Test public void fail_when_sort_by_metric_period_and_no_metric_period_sort_provided() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); db.components().insertSnapshot(project); assertThatThrownBy(() -> { @@ -984,7 +984,7 @@ public class ComponentTreeActionIT { @Test public void fail_when_paging_parameter_is_too_big() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); db.components().insertSnapshot(project); insertNclocMetric(); @@ -1001,7 +1001,7 @@ public class ComponentTreeActionIT { @Test public void fail_when_with_measures_only_and_no_metric_sort() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); db.components().insertSnapshot(project); insertNclocMetric(); @@ -1032,7 +1032,7 @@ public class ComponentTreeActionIT { @Test public void fail_when_component_is_removed() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); db.components().insertSnapshot(project); ComponentDto file = db.components().insertComponent(newFileDto(project).setKey("file-key").setEnabled(false)); userSession.anonymous().addProjectPermission(USER, project); @@ -1050,7 +1050,7 @@ public class ComponentTreeActionIT { @Test public void fail_if_branch_does_not_exist() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); userSession.addProjectPermission(USER, project); db.components().insertProjectBranch(project, b -> b.setKey("my_branch")); @@ -1068,7 +1068,7 @@ public class ComponentTreeActionIT { @Test public void doHandle_whenPassingUnexpectedQualifier_shouldThrowException(){ - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(USER, project); ComponentDto file = db.components().insertComponent(newFileDto(project)); MetricDto complexity = db.measures().insertMetric(m -> m.setValueType(INT.name())); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/measure/ws/SearchActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/measure/ws/SearchActionIT.java index 10716770549..67e48d03ee0 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/measure/ws/SearchActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/measure/ws/SearchActionIT.java @@ -37,7 +37,6 @@ import org.sonar.server.exceptions.BadRequestException; import org.sonar.server.tester.UserSessionRule; import org.sonar.server.ws.TestRequest; import org.sonar.server.ws.WsActionTester; -import org.sonarqube.ws.Measures; import org.sonarqube.ws.Measures.Measure; import org.sonarqube.ws.Measures.SearchWsResponse; @@ -69,9 +68,9 @@ public class SearchActionIT { @Test public void json_example() { - ComponentDto project1 = db.components().insertPrivateProject(p -> p.setKey("MY_PROJECT_1").setName("Project 1")); - ComponentDto project2 = db.components().insertPrivateProject(p -> p.setKey("MY_PROJECT_2").setName("Project 2")); - ComponentDto project3 = db.components().insertPrivateProject(p -> p.setKey("MY_PROJECT_3").setName("Project 3")); + ComponentDto project1 = db.components().insertPrivateProject(p -> p.setKey("MY_PROJECT_1").setName("Project 1")).getMainBranchComponent(); + ComponentDto project2 = db.components().insertPrivateProject(p -> p.setKey("MY_PROJECT_2").setName("Project 2")).getMainBranchComponent(); + ComponentDto project3 = db.components().insertPrivateProject(p -> p.setKey("MY_PROJECT_3").setName("Project 3")).getMainBranchComponent(); userSession.addProjectPermission(UserRole.USER, project1); userSession.addProjectPermission(UserRole.USER, project2); @@ -105,7 +104,7 @@ public class SearchActionIT { @Test public void return_measures() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(UserRole.USER, project); MetricDto coverage = db.measures().insertMetric(m -> m.setValueType(FLOAT.name())); db.measures().insertLiveMeasure(project, coverage, m -> m.setValue(15.5d)); @@ -121,7 +120,7 @@ public class SearchActionIT { @Test public void return_best_value() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(UserRole.USER, project); MetricDto matchBestValue = db.measures().insertMetric(m -> m.setValueType(FLOAT.name()).setBestValue(15.5d)); db.measures().insertLiveMeasure(project, matchBestValue, m -> m.setValue(15.5d)); @@ -144,7 +143,7 @@ public class SearchActionIT { @Test public void return_measures_on_new_code_period() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(UserRole.USER, project); MetricDto coverage = db.measures().insertMetric(m -> m.setKey("new_metric").setValueType(FLOAT.name())); db.measures().insertLiveMeasure(project, coverage, m -> m.setValue(10d)); @@ -163,9 +162,9 @@ public class SearchActionIT { public void sort_by_metric_key_then_project_name() { MetricDto coverage = db.measures().insertMetric(m -> m.setKey("coverage").setValueType(FLOAT.name())); MetricDto complexity = db.measures().insertMetric(m -> m.setKey("complexity").setValueType(INT.name())); - ComponentDto project1 = db.components().insertPrivateProject(p -> p.setName("C")); - ComponentDto project2 = db.components().insertPrivateProject(p -> p.setName("A")); - ComponentDto project3 = db.components().insertPrivateProject(p -> p.setName("B")); + ComponentDto project1 = db.components().insertPrivateProject(p -> p.setName("C")).getMainBranchComponent(); + ComponentDto project2 = db.components().insertPrivateProject(p -> p.setName("A")).getMainBranchComponent(); + ComponentDto project3 = db.components().insertPrivateProject(p -> p.setName("B")).getMainBranchComponent(); userSession.addProjectPermission(UserRole.USER, project1); userSession.addProjectPermission(UserRole.USER, project2); userSession.addProjectPermission(UserRole.USER, project3); @@ -202,7 +201,7 @@ public class SearchActionIT { @Test public void return_measures_on_application() { - ComponentDto application = db.components().insertPrivateApplication(); + ComponentDto application = db.components().insertPrivateApplication().getMainBranchComponent(); userSession.addProjectPermission(UserRole.USER, application); MetricDto coverage = db.measures().insertMetric(m -> m.setValueType(FLOAT.name())); db.measures().insertLiveMeasure(application, coverage, m -> m.setValue(15.5d)); @@ -237,8 +236,8 @@ public class SearchActionIT { @Test public void only_returns_authorized_projects() { MetricDto metric = db.measures().insertMetric(m -> m.setValueType(FLOAT.name())); - ComponentDto project1 = db.components().insertPrivateProject(); - ComponentDto project2 = db.components().insertPrivateProject(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); db.measures().insertLiveMeasure(project1, metric, m -> m.setValue(15.5d)); db.measures().insertLiveMeasure(project2, metric, m -> m.setValue(42.0d)); Arrays.stream(new ComponentDto[] {project1}).forEach(p -> userSession.addProjectPermission(UserRole.USER, p)); @@ -251,7 +250,7 @@ public class SearchActionIT { @Test public void does_not_return_branch_when_using_db_key() { MetricDto coverage = db.measures().insertMetric(m -> m.setValueType(FLOAT.name())); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto branch = db.components().insertProjectBranch(project); db.measures().insertLiveMeasure(branch, coverage, m -> m.setValue(10d)); userSession.addProjectPermission(UserRole.USER, project); @@ -263,7 +262,7 @@ public class SearchActionIT { @Test public void fail_if_no_metric() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(UserRole.USER, project); assertThatThrownBy(() -> call(singletonList(project.uuid()), null)) @@ -273,7 +272,7 @@ public class SearchActionIT { @Test public void fail_if_empty_metric() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(UserRole.USER, project); assertThatThrownBy(() -> call(singletonList(project.uuid()), emptyList())) @@ -283,7 +282,7 @@ public class SearchActionIT { @Test public void fail_if_unknown_metric() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(UserRole.USER, project); MetricDto metric = db.measures().insertMetric(); @@ -313,7 +312,7 @@ public class SearchActionIT { @Test public void fail_if_more_than_100_project_keys() { List keys = IntStream.rangeClosed(1, 101) - .mapToObj(i -> db.components().insertPrivateProject()) + .mapToObj(i -> db.components().insertPrivateProject().getMainBranchComponent()) .map(ComponentDto::getKey) .collect(Collectors.toList()); MetricDto metric = db.measures().insertMetric(); @@ -326,7 +325,7 @@ public class SearchActionIT { @Test public void does_not_fail_on_100_projects() { List keys = IntStream.rangeClosed(1, 100) - .mapToObj(i -> db.components().insertPrivateProject()) + .mapToObj(i -> db.components().insertPrivateProject().getMainBranchComponent()) .map(ComponentDto::getKey) .collect(Collectors.toList()); MetricDto metric = db.measures().insertMetric(); @@ -336,7 +335,7 @@ public class SearchActionIT { @Test public void fail_if_directory() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto dir = db.components().insertComponent(newDirectory(project, "dir")); userSession.addProjectPermission(UserRole.USER, project); MetricDto metric = db.measures().insertMetric(); @@ -348,7 +347,7 @@ public class SearchActionIT { @Test public void fail_if_file() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); userSession.addProjectPermission(UserRole.USER, project); MetricDto metric = db.measures().insertMetric(); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/measure/ws/SearchHistoryActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/measure/ws/SearchHistoryActionIT.java index 222b4ac399b..d4baa160954 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/measure/ws/SearchHistoryActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/measure/ws/SearchHistoryActionIT.java @@ -106,7 +106,7 @@ public class SearchHistoryActionIT { @Test public void empty_response() { - project = db.components().insertPrivateProject(); + project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(UserRole.USER, project); SearchHistoryRequest request = SearchHistoryRequest.builder() .setComponent(project.getKey()) @@ -125,7 +125,7 @@ public class SearchHistoryActionIT { @Test public void analyses_but_no_measure() { - project = db.components().insertPrivateProject(); + project = db.components().insertPrivateProject().getMainBranchComponent(); analysis = db.components().insertSnapshot(project); userSession.addProjectPermission(UserRole.USER, project); @@ -202,7 +202,7 @@ public class SearchHistoryActionIT { @Test public void pagination_applies_to_analyses() { - project = db.components().insertPrivateProject(); + project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(UserRole.USER, project); List analysisDates = LongStream.rangeClosed(1, 9) .mapToObj(i -> dbClient.snapshotDao().insert(dbSession, newAnalysis(project).setCreatedAt(i * 1_000_000_000))) @@ -226,7 +226,7 @@ public class SearchHistoryActionIT { @Test public void inclusive_from_and_to_dates() { - project = db.components().insertPrivateProject(); + project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(UserRole.USER, project); List analysisDates = LongStream.rangeClosed(1, 9) .mapToObj(i -> dbClient.snapshotDao().insert(dbSession, newAnalysis(project).setCreatedAt(System2.INSTANCE.now() + i * 1_000_000_000L))) @@ -293,7 +293,7 @@ public class SearchHistoryActionIT { @Test public void branch() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(UserRole.USER, project); ComponentDto branch = db.components().insertProjectBranch(project, b -> b.setKey("my_branch")); userSession.addProjectBranchMapping(project.uuid(), branch); @@ -317,7 +317,7 @@ public class SearchHistoryActionIT { @Test public void pull_request() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(UserRole.USER, project); ComponentDto branch = db.components().insertProjectBranch(project, b -> b.setKey("pr-123").setBranchType(PULL_REQUEST)); userSession.addProjectBranchMapping(project.uuid(), branch); @@ -365,9 +365,9 @@ public class SearchHistoryActionIT { @Test public void fail_if_not_enough_permissions_for_application() { - ComponentDto application = db.components().insertPrivateApplication(); - ComponentDto project1 = db.components().insertPrivateProject(); - ComponentDto project2 = db.components().insertPrivateProject(); + ComponentDto application = db.components().insertPrivateApplication().getMainBranchComponent(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); userSession.logIn() .registerApplication( @@ -412,7 +412,7 @@ public class SearchHistoryActionIT { @Test public void fail_if_branch_does_not_exist() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); userSession.addProjectPermission(UserRole.USER, project); db.components().insertProjectBranch(project, b -> b.setKey("my_branch")); @@ -445,7 +445,7 @@ public class SearchHistoryActionIT { @Test public void json_example() { - project = db.components().insertPrivateProject(); + project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(UserRole.USER, project); long now = parseDateTime("2017-01-23T17:00:53+0100").getTime(); LongStream.rangeClosed(0, 2) diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/newcodeperiod/ws/ListActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/newcodeperiod/ws/ListActionIT.java index a335c1f53ab..89d17bf76b2 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/newcodeperiod/ws/ListActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/newcodeperiod/ws/ListActionIT.java @@ -114,7 +114,7 @@ import static org.sonar.db.component.SnapshotTesting.newAnalysis; @Test public void throw_FE_if_no_project_permission() { - ComponentDto project = componentDb.insertPublicProject(); + ComponentDto project = componentDb.insertPublicProject().getMainBranchComponent(); assertThatThrownBy(() -> ws.newRequest() .setParam("project", project.getKey()) @@ -125,7 +125,7 @@ import static org.sonar.db.component.SnapshotTesting.newAnalysis; @Test public void list_only_branches() { - ComponentDto project = componentDb.insertPublicProject(); + ComponentDto project = componentDb.insertPublicProject().getMainBranchComponent(); createBranches(project, 5, BranchType.BRANCH); createBranches(project, 3, BranchType.PULL_REQUEST); @@ -148,7 +148,7 @@ import static org.sonar.db.component.SnapshotTesting.newAnalysis; @Test public void list_inherited_global_settings() { - ComponentDto project = componentDb.insertPublicProject(); + ComponentDto project = componentDb.insertPublicProject().getMainBranchComponent(); tester.insert(new NewCodePeriodDto().setType(NewCodePeriodType.SPECIFIC_ANALYSIS).setValue("uuid")); createBranches(project, 5, BranchType.BRANCH); @@ -175,8 +175,8 @@ import static org.sonar.db.component.SnapshotTesting.newAnalysis; @Test public void list_inherited_project_settings() { - ComponentDto projectWithOwnSettings = componentDb.insertPublicProject(); - ComponentDto projectWithGlobalSettings = componentDb.insertPublicProject(); + ComponentDto projectWithOwnSettings = componentDb.insertPublicProject().getMainBranchComponent(); + ComponentDto projectWithGlobalSettings = componentDb.insertPublicProject().getMainBranchComponent(); tester.insert(new NewCodePeriodDto() .setType(NewCodePeriodType.SPECIFIC_ANALYSIS) .setValue("global_uuid")); @@ -228,7 +228,7 @@ import static org.sonar.db.component.SnapshotTesting.newAnalysis; @Test public void list_branch_and_inherited_global_settings() { - ComponentDto project = componentDb.insertPublicProject(); + ComponentDto project = componentDb.insertPublicProject().getMainBranchComponent(); ComponentDto branchWithOwnSettings = componentDb.insertProjectBranch(project, branchDto -> branchDto.setKey("OWN_SETTINGS")); componentDb.insertProjectBranch(project, branchDto -> branchDto.setKey("GLOBAL_SETTINGS")); @@ -279,7 +279,7 @@ import static org.sonar.db.component.SnapshotTesting.newAnalysis; @Test public void list_branch_and_inherited_project_settings() { - ComponentDto project = componentDb.insertPublicProject(); + ComponentDto project = componentDb.insertPublicProject().getMainBranchComponent(); ComponentDto branchWithOwnSettings = componentDb.insertProjectBranch(project, branchDto -> branchDto.setKey("OWN_SETTINGS")); componentDb.insertProjectBranch(project, branchDto -> branchDto.setKey("PROJECT_SETTINGS")); @@ -335,7 +335,7 @@ import static org.sonar.db.component.SnapshotTesting.newAnalysis; @Test public void verify_specific_analysis_effective_value() { - ComponentDto project = componentDb.insertPublicProject(); + ComponentDto project = componentDb.insertPublicProject().getMainBranchComponent(); ComponentDto branch = componentDb.insertProjectBranch(project, branchDto -> branchDto.setKey("PROJECT_BRANCH")); SnapshotDto analysis = componentDb.insertSnapshot(newAnalysis(project) diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/newcodeperiod/ws/SetActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/newcodeperiod/ws/SetActionIT.java index d92689d9571..59cb2e96d01 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/newcodeperiod/ws/SetActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/newcodeperiod/ws/SetActionIT.java @@ -117,7 +117,7 @@ public class SetActionIT { @Test public void throw_IAE_if_type_is_invalid_for_project() { - ComponentDto project = componentDb.insertPublicProject(); + ComponentDto project = componentDb.insertPublicProject().getMainBranchComponent(); logInAsProjectAdministrator(project); assertThatThrownBy(() -> ws.newRequest() @@ -130,7 +130,7 @@ public class SetActionIT { @Test public void throw_IAE_if_no_value_for_days() { - ComponentDto project = componentDb.insertPublicProject(); + ComponentDto project = componentDb.insertPublicProject().getMainBranchComponent(); logInAsProjectAdministrator(project); assertThatThrownBy(() -> ws.newRequest() @@ -144,7 +144,7 @@ public class SetActionIT { @Test public void throw_IAE_if_no_value_for_analysis() { - ComponentDto project = componentDb.insertPublicProject(); + ComponentDto project = componentDb.insertPublicProject().getMainBranchComponent(); logInAsProjectAdministrator(project); assertThatThrownBy(() -> ws.newRequest() @@ -158,7 +158,7 @@ public class SetActionIT { @Test public void throw_IAE_if_days_is_invalid() { - ComponentDto project = componentDb.insertPublicProject(); + ComponentDto project = componentDb.insertPublicProject().getMainBranchComponent(); logInAsProjectAdministrator(project); assertThatThrownBy(() -> ws.newRequest() @@ -173,7 +173,7 @@ public class SetActionIT { @Test public void throw_IAE_if_analysis_is_not_found() { - ComponentDto project = componentDb.insertPublicProject(); + ComponentDto project = componentDb.insertPublicProject().getMainBranchComponent(); logInAsProjectAdministrator(project); assertThatThrownBy(() -> ws.newRequest() @@ -188,7 +188,7 @@ public class SetActionIT { @Test public void throw_IAE_if_analysis_doesnt_belong_to_branch() { - ComponentDto project = componentDb.insertPublicProject(); + ComponentDto project = componentDb.insertPublicProject().getMainBranchComponent(); ComponentDto branch = componentDb.insertProjectBranch(project, b -> b.setKey("branch")); SnapshotDto analysisMaster = db.components().insertSnapshot(project); @@ -229,7 +229,7 @@ public class SetActionIT { @Test public void throw_NFE_if_branch_not_found() { - ComponentDto project = componentDb.insertPublicProject(); + ComponentDto project = componentDb.insertPublicProject().getMainBranchComponent(); logInAsProjectAdministrator(project); assertThatThrownBy(() -> ws.newRequest() @@ -244,7 +244,7 @@ public class SetActionIT { // permission @Test public void throw_NFE_if_no_project_permission() { - ComponentDto project = componentDb.insertPublicProject(); + ComponentDto project = componentDb.insertPublicProject().getMainBranchComponent(); assertThatThrownBy(() -> ws.newRequest() .setParam("project", project.getKey()) @@ -276,7 +276,7 @@ public class SetActionIT { @Test public void set_project_period_to_number_of_days() { - ComponentDto project = componentDb.insertPublicProject(); + ComponentDto project = componentDb.insertPublicProject().getMainBranchComponent(); logInAsProjectAdministrator(project); ws.newRequest() .setParam("project", project.getKey()) @@ -290,7 +290,7 @@ public class SetActionIT { @UseDataProvider("provideNewCodePeriodTypeAndValue") public void never_set_project_value_in_community_edition(NewCodePeriodType type, @Nullable String value) { when(editionProvider.get()).thenReturn(Optional.of(EditionProvider.Edition.COMMUNITY)); - ComponentDto project = componentDb.insertPublicProject(); + ComponentDto project = componentDb.insertPublicProject().getMainBranchComponent(); if (value != null && NewCodePeriodType.SPECIFIC_ANALYSIS.equals(type)) { db.components().insertSnapshot(project, snapshotDto -> snapshotDto.setUuid(value)); @@ -321,7 +321,7 @@ public class SetActionIT { @Test public void set_project_twice_period_to_number_of_days() { - ComponentDto project = componentDb.insertPublicProject(); + ComponentDto project = componentDb.insertPublicProject().getMainBranchComponent(); logInAsProjectAdministrator(project); ws.newRequest() .setParam("project", project.getKey()) @@ -339,7 +339,7 @@ public class SetActionIT { @Test public void set_branch_period_to_analysis() { - ComponentDto project = componentDb.insertPublicProject(); + ComponentDto project = componentDb.insertPublicProject().getMainBranchComponent(); ComponentDto branch = componentDb.insertProjectBranch(project, b -> b.setKey("branch")); SnapshotDto analysisMaster = db.components().insertSnapshot(project); @@ -359,7 +359,7 @@ public class SetActionIT { @Test public void set_branch_period_twice_to_analysis() { - ComponentDto project = componentDb.insertPublicProject(); + ComponentDto project = componentDb.insertPublicProject().getMainBranchComponent(); ComponentDto branch = componentDb.insertProjectBranch(project, b -> b.setKey("branch")); SnapshotDto analysisMaster = db.components().insertSnapshot(project); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/newcodeperiod/ws/ShowActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/newcodeperiod/ws/ShowActionIT.java index 94eea606c3a..e5608c63afb 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/newcodeperiod/ws/ShowActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/newcodeperiod/ws/ShowActionIT.java @@ -87,7 +87,7 @@ public class ShowActionIT { @Test public void throw_FE_if_no_project_permission() { - ComponentDto project = componentDb.insertPublicProject(); + ComponentDto project = componentDb.insertPublicProject().getMainBranchComponent(); assertThatThrownBy(() -> ws.newRequest() .setParam("project", project.getKey()) @@ -98,7 +98,7 @@ public class ShowActionIT { @Test public void throw_FE_if_project_issue_admin() { - ComponentDto project = componentDb.insertPublicProject(); + ComponentDto project = componentDb.insertPublicProject().getMainBranchComponent(); logInAsProjectIssueAdmin(project); assertThatThrownBy(() -> ws.newRequest() @@ -120,7 +120,7 @@ public class ShowActionIT { @Test public void show_project_setting() { - ComponentDto project = componentDb.insertPublicProject(); + ComponentDto project = componentDb.insertPublicProject().getMainBranchComponent(); logInAsProjectAdministrator(project); tester.insert(new NewCodePeriodDto() @@ -137,7 +137,7 @@ public class ShowActionIT { @Test public void show_branch_setting() { - ComponentDto project = componentDb.insertPublicProject(); + ComponentDto project = componentDb.insertPublicProject().getMainBranchComponent(); logInAsProjectAdministrator(project); ComponentDto branch = componentDb.insertProjectBranch(project, b -> b.setKey("branch")); @@ -158,7 +158,7 @@ public class ShowActionIT { @Test public void show_inherited_project_setting() { - ComponentDto project = componentDb.insertPublicProject(); + ComponentDto project = componentDb.insertPublicProject().getMainBranchComponent(); logInAsProjectAdministrator(project); tester.insert(new NewCodePeriodDto().setType(NewCodePeriodType.PREVIOUS_VERSION)); @@ -171,7 +171,7 @@ public class ShowActionIT { @Test public void show_inherited_branch_setting_from_project() { - ComponentDto project = componentDb.insertPublicProject(); + ComponentDto project = componentDb.insertPublicProject().getMainBranchComponent(); logInAsProjectAdministrator(project); ComponentDto branch = componentDb.insertProjectBranch(project, b -> b.setKey("branch")); @@ -191,7 +191,7 @@ public class ShowActionIT { @Test public void show_inherited_branch_setting_from_global() { - ComponentDto project = componentDb.insertPublicProject(); + ComponentDto project = componentDb.insertPublicProject().getMainBranchComponent(); logInAsProjectAdministrator(project); ComponentDto branch = componentDb.insertProjectBranch(project, b -> b.setKey("branch")); tester.insert(new NewCodePeriodDto().setType(NewCodePeriodType.NUMBER_OF_DAYS).setValue("3")); @@ -217,7 +217,7 @@ public class ShowActionIT { @Test public void show_inherited_if_branch_not_found() { - ComponentDto project = componentDb.insertPublicProject(); + ComponentDto project = componentDb.insertPublicProject().getMainBranchComponent(); logInAsProjectScan(project); tester.insert(project.branchUuid(), NewCodePeriodType.NUMBER_OF_DAYS, "3"); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/newcodeperiod/ws/UnsetActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/newcodeperiod/ws/UnsetActionIT.java index 2e0a55afc40..6dee555fbff 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/newcodeperiod/ws/UnsetActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/newcodeperiod/ws/UnsetActionIT.java @@ -104,7 +104,7 @@ public class UnsetActionIT { @Test public void throw_NFE_if_branch_not_found() { - ComponentDto project = componentDb.insertPublicProject(); + ComponentDto project = componentDb.insertPublicProject().getMainBranchComponent(); logInAsProjectAdministrator(project); assertThatThrownBy(() -> ws.newRequest() @@ -119,7 +119,7 @@ public class UnsetActionIT { // permission @Test public void throw_NFE_if_no_project_permission() { - ComponentDto project = componentDb.insertPublicProject(); + ComponentDto project = componentDb.insertPublicProject().getMainBranchComponent(); assertThatThrownBy(() -> ws.newRequest() .setParam("project", project.getKey()) @@ -150,7 +150,7 @@ public class UnsetActionIT { @Test public void delete_project_period() { - ComponentDto project = componentDb.insertPublicProject(); + ComponentDto project = componentDb.insertPublicProject().getMainBranchComponent(); logInAsProjectAdministrator(project); ws.newRequest() .setParam("project", project.getKey()) @@ -161,8 +161,8 @@ public class UnsetActionIT { @Test public void delete_project_period_twice() { - ComponentDto project1 = componentDb.insertPublicProject(); - ComponentDto project2 = componentDb.insertPublicProject(); + ComponentDto project1 = componentDb.insertPublicProject().getMainBranchComponent(); + ComponentDto project2 = componentDb.insertPublicProject().getMainBranchComponent(); db.newCodePeriods().insert(project1.uuid(), null, NewCodePeriodType.SPECIFIC_ANALYSIS, "uuid1"); db.newCodePeriods().insert(project2.uuid(), null, NewCodePeriodType.SPECIFIC_ANALYSIS, "uuid2"); @@ -181,7 +181,7 @@ public class UnsetActionIT { @Test public void delete_branch_period() { - ComponentDto project = componentDb.insertPublicProject(); + ComponentDto project = componentDb.insertPublicProject().getMainBranchComponent(); ComponentDto branch = componentDb.insertProjectBranch(project, b -> b.setKey("branch")); db.newCodePeriods().insert(project.uuid(), null, NewCodePeriodType.SPECIFIC_ANALYSIS, "uuid1"); @@ -199,7 +199,7 @@ public class UnsetActionIT { @Test public void delete_branch_and_project_period_in_community_edition() { - ComponentDto project = componentDb.insertPublicProject(); + ComponentDto project = componentDb.insertPublicProject().getMainBranchComponent(); db.newCodePeriods().insert(project.uuid(), null, NewCodePeriodType.SPECIFIC_ANALYSIS, "uuid1"); db.newCodePeriods().insert(project.uuid(), project.uuid(), NewCodePeriodType.SPECIFIC_ANALYSIS, "uuid2"); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/notification/ws/AddActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/notification/ws/AddActionIT.java index dd2038d79c6..7fcb3ea1688 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/notification/ws/AddActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/notification/ws/AddActionIT.java @@ -104,7 +104,7 @@ public class AddActionIT { public void add_notification_on_private_with_USER_permission() { UserDto user = db.users().insertUser(); userSession.logIn(user); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(USER, project); when(dispatchers.getGlobalDispatchers()).thenReturn(singletonList(NOTIF_MY_NEW_ISSUES)); when(dispatchers.getProjectDispatchers()).thenReturn(singletonList(NOTIF_MY_NEW_ISSUES)); @@ -118,7 +118,7 @@ public class AddActionIT { public void add_notification_on_public_project() { UserDto user = db.users().insertUser(); userSession.logIn(user); - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); userSession.registerComponents(project); when(dispatchers.getGlobalDispatchers()).thenReturn(singletonList(NOTIF_MY_NEW_ISSUES)); when(dispatchers.getProjectDispatchers()).thenReturn(singletonList(NOTIF_MY_NEW_ISSUES)); @@ -134,7 +134,7 @@ public class AddActionIT { userSession.logIn(user); when(dispatchers.getGlobalDispatchers()).thenReturn(singletonList(NOTIF_MY_NEW_ISSUES)); when(dispatchers.getProjectDispatchers()).thenReturn(asList(NOTIF_MY_NEW_ISSUES)); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(USER, project); call(NOTIF_MY_NEW_ISSUES, null, project.getKey(), null); @@ -150,7 +150,7 @@ public class AddActionIT { userSession.logIn(user); when(dispatchers.getGlobalDispatchers()).thenReturn(singletonList(NOTIF_MY_NEW_ISSUES)); when(dispatchers.getProjectDispatchers()).thenReturn(singletonList(NOTIF_MY_NEW_ISSUES)); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); call(NOTIF_MY_NEW_ISSUES, null, null, null); userSession.addProjectPermission(USER, project); @@ -166,7 +166,7 @@ public class AddActionIT { userSession.logIn(user); when(dispatchers.getGlobalDispatchers()).thenReturn(singletonList(NOTIF_MY_NEW_ISSUES)); when(dispatchers.getProjectDispatchers()).thenReturn(singletonList(NOTIF_MY_NEW_ISSUES)); - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); userSession.registerComponents(project); call(NOTIF_MY_NEW_ISSUES, null, null, null); @@ -250,7 +250,7 @@ public class AddActionIT { @Test public void fail_when_unknown_project_dispatcher_on_private_project() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(USER, project); when(dispatchers.getGlobalDispatchers()).thenReturn(asList(NOTIF_MY_NEW_ISSUES, NOTIF_NEW_ISSUES)); when(dispatchers.getProjectDispatchers()).thenReturn(asList(NOTIF_MY_NEW_ISSUES, NOTIF_NEW_ISSUES)); @@ -264,7 +264,7 @@ public class AddActionIT { public void fail_when_unknown_project_dispatcher_on_public_project() { UserDto user = db.users().insertUser(); userSession.logIn(user); - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); when(dispatchers.getGlobalDispatchers()).thenReturn(asList(NOTIF_MY_NEW_ISSUES, NOTIF_NEW_ISSUES)); when(dispatchers.getProjectDispatchers()).thenReturn(asList(NOTIF_MY_NEW_ISSUES, NOTIF_NEW_ISSUES)); @@ -314,7 +314,7 @@ public class AddActionIT { @Test public void fail_when_user_does_not_have_USER_permission_on_private_project() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.logIn().setNonSystemAdministrator(); when(dispatchers.getGlobalDispatchers()).thenReturn(singletonList(NOTIF_MY_NEW_ISSUES)); when(dispatchers.getProjectDispatchers()).thenReturn(singletonList(NOTIF_MY_NEW_ISSUES)); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/notification/ws/ListActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/notification/ws/ListActionIT.java index a8a2817450c..49eefadb1c9 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/notification/ws/ListActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/notification/ws/ListActionIT.java @@ -110,9 +110,9 @@ public class ListActionIT { userSession.logIn(user); when(dispatchers.getGlobalDispatchers()).thenReturn(singletonList(NOTIF_MY_NEW_ISSUES)); when(dispatchers.getProjectDispatchers()).thenReturn(singletonList(NOTIF_MY_NEW_ISSUES)); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); db.users().insertProjectPermissionOnUser(user, USER, project); - ComponentDto anotherProject = db.components().insertPrivateProject(); + ComponentDto anotherProject = db.components().insertPrivateProject().getMainBranchComponent(); notificationUpdater.add(dbSession, emailChannel.getKey(), NOTIF_MY_NEW_ISSUES, user, project); notificationUpdater.add(dbSession, emailChannel.getKey(), NOTIF_MY_NEW_ISSUES, user, anotherProject); dbSession.commit(); @@ -155,7 +155,7 @@ public class ListActionIT { UserDto user = db.users().insertUser(); userSession.logIn(user); when(dispatchers.getProjectDispatchers()).thenReturn(singletonList(NOTIF_MY_NEW_ISSUES)); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); db.users().insertProjectPermissionOnUser(user, USER, project); notificationUpdater.add(dbSession, emailChannel.getKey(), NOTIF_MY_NEW_ISSUES, user, project); notificationUpdater.add(dbSession, emailChannel.getKey(), "Unknown Notification", user, project); @@ -174,7 +174,7 @@ public class ListActionIT { userSession.logIn(user); when(dispatchers.getGlobalDispatchers()).thenReturn(asList(NOTIF_MY_NEW_ISSUES, NOTIF_NEW_ISSUES, NOTIF_NEW_QUALITY_GATE_STATUS)); when(dispatchers.getProjectDispatchers()).thenReturn(asList(NOTIF_MY_NEW_ISSUES, NOTIF_NEW_QUALITY_GATE_STATUS)); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); db.users().insertProjectPermissionOnUser(user, USER, project); notificationUpdater.add(dbSession, twitterChannel.getKey(), NOTIF_MY_NEW_ISSUES, user, null); notificationUpdater.add(dbSession, emailChannel.getKey(), NOTIF_MY_NEW_ISSUES, user, null); @@ -241,7 +241,7 @@ public class ListActionIT { userSession.logIn(user); when(dispatchers.getGlobalDispatchers()).thenReturn(asList(NOTIF_MY_NEW_ISSUES, NOTIF_NEW_ISSUES, NOTIF_NEW_QUALITY_GATE_STATUS)); when(dispatchers.getProjectDispatchers()).thenReturn(asList(NOTIF_MY_NEW_ISSUES, NOTIF_NEW_QUALITY_GATE_STATUS)); - ComponentDto project = db.components().insertPrivateProject(p -> p.setKey(KEY_PROJECT_EXAMPLE_001).setName("My Project")); + ComponentDto project = db.components().insertPrivateProject(p -> p.setKey(KEY_PROJECT_EXAMPLE_001).setName("My Project")).getMainBranchComponent(); db.users().insertProjectPermissionOnUser(user, USER, project); notificationUpdater.add(dbSession, twitterChannel.getKey(), NOTIF_MY_NEW_ISSUES, user, null); notificationUpdater.add(dbSession, emailChannel.getKey(), NOTIF_MY_NEW_ISSUES, user, null); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/notification/ws/RemoveActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/notification/ws/RemoveActionIT.java index 35fcc19fb05..f135134a2c4 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/notification/ws/RemoveActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/notification/ws/RemoveActionIT.java @@ -111,7 +111,7 @@ public class RemoveActionIT { userSession.logIn(user); when(dispatchers.getGlobalDispatchers()).thenReturn(singletonList(NOTIF_MY_NEW_ISSUES)); when(dispatchers.getProjectDispatchers()).thenReturn(singletonList(NOTIF_MY_NEW_ISSUES)); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); notificationUpdater.add(dbSession, defaultChannel.getKey(), NOTIF_MY_NEW_ISSUES, user, project); dbSession.commit(); @@ -126,7 +126,7 @@ public class RemoveActionIT { userSession.logIn(user); when(dispatchers.getGlobalDispatchers()).thenReturn(singletonList(NOTIF_MY_NEW_ISSUES)); when(dispatchers.getProjectDispatchers()).thenReturn(singletonList(NOTIF_MY_NEW_ISSUES)); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); notificationUpdater.add(dbSession, defaultChannel.getKey(), NOTIF_MY_NEW_ISSUES, user, project); dbSession.commit(); @@ -141,7 +141,7 @@ public class RemoveActionIT { userSession.logIn(user); when(dispatchers.getGlobalDispatchers()).thenReturn(singletonList(NOTIF_MY_NEW_ISSUES)); when(dispatchers.getProjectDispatchers()).thenReturn(singletonList(NOTIF_MY_NEW_ISSUES)); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); notificationUpdater.add(dbSession, defaultChannel.getKey(), NOTIF_MY_NEW_ISSUES, user, null); dbSession.commit(); @@ -245,7 +245,7 @@ public class RemoveActionIT { userSession.logIn(user); when(dispatchers.getGlobalDispatchers()).thenReturn(singletonList(NOTIF_MY_NEW_ISSUES)); when(dispatchers.getProjectDispatchers()).thenReturn(asList(NOTIF_MY_NEW_ISSUES, NOTIF_NEW_QUALITY_GATE_STATUS)); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); RemoveRequest request = this.request.setType("Dispatcher42").setProject(project.getKey()); assertThatThrownBy(() -> call(request)) diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/permission/GroupPermissionChangerIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/permission/GroupPermissionChangerIT.java index cb6d3b1551d..c03dd0b337f 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/permission/GroupPermissionChangerIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/permission/GroupPermissionChangerIT.java @@ -61,8 +61,8 @@ public class GroupPermissionChangerIT { @Before public void setUp() { group = db.users().insertGroup("a-group"); - privateProject = db.components().insertPrivateProject(); - publicProject = db.components().insertPublicProject(); + privateProject = db.components().insertPrivateProject().getMainBranchComponent(); + publicProject = db.components().insertPublicProject().getMainBranchComponent(); } @Test diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/permission/PermissionTemplateServiceIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/permission/PermissionTemplateServiceIT.java index c280ab8d8a6..39976fdc4d3 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/permission/PermissionTemplateServiceIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/permission/PermissionTemplateServiceIT.java @@ -66,7 +66,7 @@ public class PermissionTemplateServiceIT { @Test public void apply_does_not_insert_permission_to_group_AnyOne_when_applying_template_on_private_project() { - ComponentDto privateProject = dbTester.components().insertPrivateProject(); + ComponentDto privateProject = dbTester.components().insertPrivateProject().getMainBranchComponent(); PermissionTemplateDto permissionTemplate = dbTester.permissionTemplates().insertTemplate(); dbTester.permissionTemplates().addAnyoneToTemplate(permissionTemplate, "p1"); @@ -77,7 +77,7 @@ public class PermissionTemplateServiceIT { @Test public void apply_default_does_not_insert_permission_to_group_AnyOne_when_applying_template_on_private_project() { - ComponentDto privateProject = dbTester.components().insertPrivateProject(); + ComponentDto privateProject = dbTester.components().insertPrivateProject().getMainBranchComponent(); UserDto creator = dbTester.users().insertUser(); PermissionTemplateDto permissionTemplate = dbTester.permissionTemplates().insertTemplate(); dbTester.permissionTemplates().addAnyoneToTemplate(permissionTemplate, "p1"); @@ -90,7 +90,7 @@ public class PermissionTemplateServiceIT { @Test public void apply_inserts_permissions_to_group_AnyOne_but_USER_and_CODEVIEWER_when_applying_template_on_public_project() { - ComponentDto publicProject = dbTester.components().insertPublicProject(); + ComponentDto publicProject = dbTester.components().insertPublicProject().getMainBranchComponent(); PermissionTemplateDto permissionTemplate = dbTester.permissionTemplates().insertTemplate(); permissionService.getAllProjectPermissions() .forEach(perm -> dbTester.permissionTemplates().addAnyoneToTemplate(permissionTemplate, perm)); @@ -104,7 +104,7 @@ public class PermissionTemplateServiceIT { @Test public void applyDefault_inserts_permissions_to_group_AnyOne_but_USER_and_CODEVIEWER_when_applying_template_on_public_project() { - ComponentDto publicProject = dbTester.components().insertPublicProject(); + ComponentDto publicProject = dbTester.components().insertPublicProject().getMainBranchComponent(); PermissionTemplateDto permissionTemplate = dbTester.permissionTemplates().insertTemplate(); permissionService.getAllProjectPermissions() .forEach(perm -> dbTester.permissionTemplates().addAnyoneToTemplate(permissionTemplate, perm)); @@ -119,7 +119,7 @@ public class PermissionTemplateServiceIT { @Test public void apply_inserts_any_permissions_to_group_when_applying_template_on_private_project() { - ComponentDto privateProject = dbTester.components().insertPrivateProject(); + ComponentDto privateProject = dbTester.components().insertPrivateProject().getMainBranchComponent(); GroupDto group = dbTester.users().insertGroup(); PermissionTemplateDto permissionTemplate = dbTester.permissionTemplates().insertTemplate(); permissionService.getAllProjectPermissions() @@ -135,7 +135,7 @@ public class PermissionTemplateServiceIT { @Test public void applyDefault_inserts_any_permissions_to_group_when_applying_template_on_private_project() { GroupDto group = dbTester.users().insertGroup(); - ComponentDto privateProject = dbTester.components().insertPrivateProject(); + ComponentDto privateProject = dbTester.components().insertPrivateProject().getMainBranchComponent(); PermissionTemplateDto permissionTemplate = dbTester.permissionTemplates().insertTemplate(); permissionService.getAllProjectPermissions() .forEach(perm -> dbTester.permissionTemplates().addGroupToTemplate(permissionTemplate, group, perm)); @@ -151,7 +151,7 @@ public class PermissionTemplateServiceIT { @Test public void apply_inserts_permissions_to_group_but_USER_and_CODEVIEWER_when_applying_template_on_public_project() { PermissionTemplateDto permissionTemplate = dbTester.permissionTemplates().insertTemplate(); - ComponentDto publicProject = dbTester.components().insertPublicProject(); + ComponentDto publicProject = dbTester.components().insertPublicProject().getMainBranchComponent(); GroupDto group = dbTester.users().insertGroup(); permissionService.getAllProjectPermissions() .forEach(perm -> dbTester.permissionTemplates().addGroupToTemplate(permissionTemplate, group, perm)); @@ -166,7 +166,7 @@ public class PermissionTemplateServiceIT { @Test public void applyDefault_inserts_permissions_to_group_but_USER_and_CODEVIEWER_when_applying_template_on_public_project() { PermissionTemplateDto permissionTemplate = dbTester.permissionTemplates().insertTemplate(); - ComponentDto publicProject = dbTester.components().insertPublicProject(); + ComponentDto publicProject = dbTester.components().insertPublicProject().getMainBranchComponent(); GroupDto group = dbTester.users().insertGroup(); permissionService.getAllProjectPermissions() .forEach(perm -> dbTester.permissionTemplates().addGroupToTemplate(permissionTemplate, group, perm)); @@ -182,7 +182,7 @@ public class PermissionTemplateServiceIT { @Test public void apply_inserts_permissions_to_user_but_USER_and_CODEVIEWER_when_applying_template_on_public_project() { PermissionTemplateDto permissionTemplate = dbTester.permissionTemplates().insertTemplate(); - ComponentDto publicProject = dbTester.components().insertPublicProject(); + ComponentDto publicProject = dbTester.components().insertPublicProject().getMainBranchComponent(); UserDto user = dbTester.users().insertUser(); permissionService.getAllProjectPermissions() .forEach(perm -> dbTester.permissionTemplates().addUserToTemplate(permissionTemplate, user, perm)); @@ -197,7 +197,7 @@ public class PermissionTemplateServiceIT { @Test public void applyDefault_inserts_permissions_to_user_but_USER_and_CODEVIEWER_when_applying_template_on_public_project() { PermissionTemplateDto permissionTemplate = dbTester.permissionTemplates().insertTemplate(); - ComponentDto publicProject = dbTester.components().insertPublicProject(); + ComponentDto publicProject = dbTester.components().insertPublicProject().getMainBranchComponent(); UserDto user = dbTester.users().insertUser(); permissionService.getAllProjectPermissions() .forEach(perm -> dbTester.permissionTemplates().addUserToTemplate(permissionTemplate, user, perm)); @@ -213,7 +213,7 @@ public class PermissionTemplateServiceIT { @Test public void apply_inserts_any_permissions_to_user_when_applying_template_on_private_project() { PermissionTemplateDto permissionTemplate = dbTester.permissionTemplates().insertTemplate(); - ComponentDto privateProject = dbTester.components().insertPrivateProject(); + ComponentDto privateProject = dbTester.components().insertPrivateProject().getMainBranchComponent(); UserDto user = dbTester.users().insertUser(); permissionService.getAllProjectPermissions() .forEach(perm -> dbTester.permissionTemplates().addUserToTemplate(permissionTemplate, user, perm)); @@ -228,7 +228,7 @@ public class PermissionTemplateServiceIT { @Test public void applyDefault_inserts_any_permissions_to_user_when_applying_template_on_private_project() { PermissionTemplateDto permissionTemplate = dbTester.permissionTemplates().insertTemplate(); - ComponentDto privateProject = dbTester.components().insertPrivateProject(); + ComponentDto privateProject = dbTester.components().insertPrivateProject().getMainBranchComponent(); UserDto user = dbTester.users().insertUser(); permissionService.getAllProjectPermissions() .forEach(perm -> dbTester.permissionTemplates().addUserToTemplate(permissionTemplate, user, perm)); @@ -244,7 +244,7 @@ public class PermissionTemplateServiceIT { @Test public void applyDefault_inserts_permissions_to_ProjectCreator_but_USER_and_CODEVIEWER_when_applying_template_on_public_project() { PermissionTemplateDto permissionTemplate = dbTester.permissionTemplates().insertTemplate(); - ComponentDto publicProject = dbTester.components().insertPublicProject(); + ComponentDto publicProject = dbTester.components().insertPublicProject().getMainBranchComponent(); UserDto user = dbTester.users().insertUser(); permissionService.getAllProjectPermissions() .forEach(perm -> dbTester.permissionTemplates().addProjectCreatorToTemplate(permissionTemplate, perm)); @@ -260,7 +260,7 @@ public class PermissionTemplateServiceIT { @Test public void applyDefault_inserts_any_permissions_to_ProjectCreator_when_applying_template_on_private_project() { PermissionTemplateDto permissionTemplate = dbTester.permissionTemplates().insertTemplate(); - ComponentDto privateProject = dbTester.components().insertPrivateProject(); + ComponentDto privateProject = dbTester.components().insertPrivateProject().getMainBranchComponent(); UserDto user = dbTester.users().insertUser(); permissionService.getAllProjectPermissions() .forEach(perm -> dbTester.permissionTemplates().addProjectCreatorToTemplate(permissionTemplate, perm)); @@ -290,7 +290,7 @@ public class PermissionTemplateServiceIT { @Test public void apply_default_template_on_application() { - ComponentDto view = dbTester.components().insertPublicApplication(); + ComponentDto view = dbTester.components().insertPublicApplication().getMainBranchComponent(); PermissionTemplateDto projectPermissionTemplate = dbTester.permissionTemplates().insertTemplate(); PermissionTemplateDto appPermissionTemplate = dbTester.permissionTemplates().insertTemplate(); GroupDto group = dbTester.users().insertGroup(); @@ -335,7 +335,7 @@ public class PermissionTemplateServiceIT { @Test public void apply_template_on_applications() { - ComponentDto application = dbTester.components().insertPublicApplication(); + ComponentDto application = dbTester.components().insertPublicApplication().getMainBranchComponent(); PermissionTemplateDto permissionTemplate = dbTester.permissionTemplates().insertTemplate(); GroupDto group = dbTester.users().insertGroup(); dbTester.permissionTemplates().addGroupToTemplate(permissionTemplate, group, GlobalPermission.ADMINISTER.getKey()); @@ -350,7 +350,7 @@ public class PermissionTemplateServiceIT { @Test public void apply_default_view_template_on_application() { - ComponentDto application = dbTester.components().insertPublicApplication(); + ComponentDto application = dbTester.components().insertPublicApplication().getMainBranchComponent(); PermissionTemplateDto projectPermissionTemplate = dbTester.permissionTemplates().insertTemplate(); PermissionTemplateDto appPermissionTemplate = dbTester.permissionTemplates().insertTemplate(); PermissionTemplateDto portPermissionTemplate = dbTester.permissionTemplates().insertTemplate(); @@ -367,7 +367,7 @@ public class PermissionTemplateServiceIT { @Test public void apply_project_default_template_on_application_when_no_application_default_template() { - ComponentDto application = dbTester.components().insertPublicApplication(); + ComponentDto application = dbTester.components().insertPublicApplication().getMainBranchComponent(); PermissionTemplateDto projectPermissionTemplate = dbTester.permissionTemplates().insertTemplate(); GroupDto group = dbTester.users().insertGroup(); dbTester.permissionTemplates().addGroupToTemplate(projectPermissionTemplate, group, GlobalPermission.PROVISION_PROJECTS.getKey()); @@ -381,7 +381,7 @@ public class PermissionTemplateServiceIT { @Test public void apply_permission_template() { UserDto user = dbTester.users().insertUser(); - ComponentDto project = dbTester.components().insertPrivateProject(); + ComponentDto project = dbTester.components().insertPrivateProject().getMainBranchComponent(); GroupDto adminGroup = dbTester.users().insertGroup(); GroupDto userGroup = dbTester.users().insertGroup(); dbTester.users().insertPermissionOnGroup(adminGroup, GlobalPermission.ADMINISTER.getKey()); @@ -468,7 +468,7 @@ public class PermissionTemplateServiceIT { .map(x -> String.format("\"%s\"", x)) .collect(Collectors.joining(", ")); - ComponentDto project = dbTester.components().insertPrivateProject(p -> p.setKey(key)); + ComponentDto project = dbTester.components().insertPrivateProject(p -> p.setKey(key)).getMainBranchComponent(); assertThatThrownBy(() -> underTest.applyDefaultToNewComponent(session, project, null)) .isInstanceOf(TemplateMatchingKeyException.class) diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/permission/UserPermissionChangerIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/permission/UserPermissionChangerIT.java index dd46c3bc6da..6d6cd7bb534 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/permission/UserPermissionChangerIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/permission/UserPermissionChangerIT.java @@ -59,8 +59,8 @@ public class UserPermissionChangerIT { public void setUp() { user1 = db.users().insertUser(); user2 = db.users().insertUser(); - privateProject = db.components().insertPrivateProject(); - publicProject = db.components().insertPublicProject(); + privateProject = db.components().insertPrivateProject().getMainBranchComponent(); + publicProject = db.components().insertPublicProject().getMainBranchComponent(); } @Test @@ -274,7 +274,7 @@ public class UserPermissionChangerIT { @Test public void remove_project_permission_from_user() { - ComponentDto project2 = db.components().insertPrivateProject(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); db.users().insertGlobalPermissionOnUser(user1, GlobalPermission.ADMINISTER_QUALITY_GATES); db.users().insertProjectPermissionOnUser(user1, UserRole.ISSUE_ADMIN, privateProject); db.users().insertProjectPermissionOnUser(user1, UserRole.USER, privateProject); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/permission/ws/AddGroupActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/permission/ws/AddGroupActionIT.java index 29a3cdb96f7..0fe249c48bf 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/permission/ws/AddGroupActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/permission/ws/AddGroupActionIT.java @@ -123,7 +123,7 @@ public class AddGroupActionIT extends BasePermissionWsIT { @Test public void add_permission_to_project_referenced_by_its_key() { GroupDto group = db.users().insertGroup("sonar-administrators"); - ComponentDto project = db.components().insertPrivateProject(A_PROJECT_UUID, c -> c.setKey(A_PROJECT_KEY)); + ComponentDto project = db.components().insertPrivateProject(A_PROJECT_UUID, c -> c.setKey(A_PROJECT_KEY)).getMainBranchComponent(); loginAsAdmin(); newRequest() @@ -169,7 +169,7 @@ public class AddGroupActionIT extends BasePermissionWsIT { @Test public void fail_when_component_is_a_directory() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newDirectory(project, "A/B")); failIfComponentIsNotAProjectOrView(file); @@ -177,7 +177,7 @@ public class AddGroupActionIT extends BasePermissionWsIT { @Test public void fail_when_component_is_a_file() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project, null, "file-uuid")); failIfComponentIsNotAProjectOrView(file); @@ -185,7 +185,7 @@ public class AddGroupActionIT extends BasePermissionWsIT { @Test public void fail_when_component_is_a_subview() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newSubPortfolio(project)); failIfComponentIsNotAProjectOrView(file); @@ -220,7 +220,7 @@ public class AddGroupActionIT extends BasePermissionWsIT { @Test public void adding_a_project_permission_fails_if_component_is_not_a_project() { GroupDto group = db.users().insertGroup("sonar-administrators"); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(ComponentTesting.newFileDto(project, null, "file-uuid")); loginAsAdmin(); @@ -290,7 +290,7 @@ public class AddGroupActionIT extends BasePermissionWsIT { @Test public void fail_when_project_uuid_and_project_key_are_provided() { GroupDto group = db.users().insertGroup(); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); loginAsAdmin(); assertThatThrownBy(() -> { @@ -322,7 +322,7 @@ public class AddGroupActionIT extends BasePermissionWsIT { @Test public void adding_project_permission_fails_if_not_administrator_of_project() { GroupDto group = db.users().insertGroup("sonar-administrators"); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.logIn(); assertThatThrownBy(() -> { @@ -341,7 +341,7 @@ public class AddGroupActionIT extends BasePermissionWsIT { @Test public void adding_project_permission_is_allowed_to_project_administrators() { GroupDto group = db.users().insertGroup("sonar-administrators"); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.logIn().addProjectPermission(UserRole.ADMIN, project); newRequest() @@ -355,7 +355,7 @@ public class AddGroupActionIT extends BasePermissionWsIT { @Test public void fails_when_adding_any_permission_to_group_AnyOne_on_a_private_project() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.logIn().addProjectPermission(UserRole.ADMIN, project); permissionService.getAllProjectPermissions() @@ -375,7 +375,7 @@ public class AddGroupActionIT extends BasePermissionWsIT { @Test public void no_effect_when_adding_USER_permission_to_group_AnyOne_on_a_public_project() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); userSession.logIn().addProjectPermission(UserRole.ADMIN, project); newRequest() @@ -389,7 +389,7 @@ public class AddGroupActionIT extends BasePermissionWsIT { @Test public void no_effect_when_adding_CODEVIEWER_permission_to_group_AnyOne_on_a_public_project() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); userSession.logIn().addProjectPermission(UserRole.ADMIN, project); newRequest() @@ -404,7 +404,7 @@ public class AddGroupActionIT extends BasePermissionWsIT { @Test public void no_effect_when_adding_USER_permission_to_group_on_a_public_project() { GroupDto group = db.users().insertGroup(); - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); userSession.logIn().addProjectPermission(UserRole.ADMIN, project); newRequest() @@ -419,7 +419,7 @@ public class AddGroupActionIT extends BasePermissionWsIT { @Test public void no_effect_when_adding_CODEVIEWER_permission_to_group_on_a_public_project() { GroupDto group = db.users().insertGroup(); - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); userSession.logIn().addProjectPermission(UserRole.ADMIN, project); newRequest() @@ -434,7 +434,7 @@ public class AddGroupActionIT extends BasePermissionWsIT { @Test public void fail_when_using_branch_uuid() { GroupDto group = db.users().insertGroup(); - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); userSession.logIn().addProjectPermission(UserRole.ADMIN, project); ComponentDto branch = db.components().insertProjectBranch(project); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/permission/ws/AddUserActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/permission/ws/AddUserActionIT.java index 14caaf44575..f65614a321b 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/permission/ws/AddUserActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/permission/ws/AddUserActionIT.java @@ -82,7 +82,7 @@ public class AddUserActionIT extends BasePermissionWsIT { @Test public void add_permission_to_project_referenced_by_its_id() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); loginAsAdmin(); newRequest() @@ -97,7 +97,7 @@ public class AddUserActionIT extends BasePermissionWsIT { @Test public void add_permission_to_project_referenced_by_its_key() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); loginAsAdmin(); newRequest() @@ -141,7 +141,7 @@ public class AddUserActionIT extends BasePermissionWsIT { @Test public void fail_when_component_is_a_directory() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newDirectory(project, "A/B")); failIfComponentIsNotAProjectOrView(file); @@ -149,7 +149,7 @@ public class AddUserActionIT extends BasePermissionWsIT { @Test public void fail_when_component_is_a_file() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project, null, "file-uuid")); failIfComponentIsNotAProjectOrView(file); @@ -157,7 +157,7 @@ public class AddUserActionIT extends BasePermissionWsIT { @Test public void fail_when_component_is_a_subview() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newSubPortfolio(project)); failIfComponentIsNotAProjectOrView(file); @@ -192,7 +192,7 @@ public class AddUserActionIT extends BasePermissionWsIT { @Test public void fail_when_component_is_not_a_project() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); db.components().insertComponent(newFileDto(project, null, "file-uuid")); loginAsAdmin(); @@ -246,7 +246,7 @@ public class AddUserActionIT extends BasePermissionWsIT { @Test public void fail_when_project_uuid_and_project_key_are_provided() { - db.components().insertPrivateProject(); + db.components().insertPrivateProject().getMainBranchComponent(); loginAsAdmin(); assertThatThrownBy(() -> { @@ -276,7 +276,7 @@ public class AddUserActionIT extends BasePermissionWsIT { @Test public void adding_project_permission_fails_if_not_administrator_of_project() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.logIn(); TestRequest request = newRequest() @@ -290,7 +290,7 @@ public class AddUserActionIT extends BasePermissionWsIT { @Test public void adding_project_permission_fails_if_user_doesnt_exist_and_not_administrator_of_project() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.logIn(); TestRequest request = newRequest() @@ -303,7 +303,7 @@ public class AddUserActionIT extends BasePermissionWsIT { @Test public void adding_project_permission_fails_if_not_administrator_of_project_and_login_param_is_missing() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.logIn(); TestRequest request = newRequest() @@ -319,7 +319,7 @@ public class AddUserActionIT extends BasePermissionWsIT { */ @Test public void adding_project_permission_is_allowed_to_project_administrators() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.logIn().addProjectPermission(UserRole.ADMIN, project); @@ -334,7 +334,7 @@ public class AddUserActionIT extends BasePermissionWsIT { @Test public void no_effect_when_adding_USER_permission_on_a_public_project() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); userSession.logIn().addProjectPermission(UserRole.ADMIN, project); newRequest() @@ -348,7 +348,7 @@ public class AddUserActionIT extends BasePermissionWsIT { @Test public void no_effect_when_adding_CODEVIEWER_permission_on_a_public_project() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); userSession.logIn().addProjectPermission(UserRole.ADMIN, project); newRequest() @@ -362,7 +362,7 @@ public class AddUserActionIT extends BasePermissionWsIT { @Test public void fail_when_using_branch_uuid() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); userSession.logIn().addProjectPermission(UserRole.ADMIN, project); ComponentDto branch = db.components().insertProjectBranch(project); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/permission/ws/GroupsActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/permission/ws/GroupsActionIT.java index e89826e7f44..6b96cce5f95 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/permission/ws/GroupsActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/permission/ws/GroupsActionIT.java @@ -185,11 +185,11 @@ public class GroupsActionIT extends BasePermissionWsIT { @Test public void search_groups_with_project_permissions() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); GroupDto group = db.users().insertGroup("project-group-name"); db.users().insertProjectPermissionOnGroup(group, ISSUE_ADMIN, project); - ComponentDto anotherProject = db.components().insertPrivateProject(); + ComponentDto anotherProject = db.components().insertPrivateProject().getMainBranchComponent(); GroupDto anotherGroup = db.users().insertGroup("another-project-group-name"); db.users().insertProjectPermissionOnGroup(anotherGroup, ISSUE_ADMIN, anotherProject); @@ -209,7 +209,7 @@ public class GroupsActionIT extends BasePermissionWsIT { @Test public void return_also_groups_without_permission_when_search_query() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); GroupDto group = db.users().insertGroup("group-with-permission"); db.users().insertProjectPermissionOnGroup(group, ISSUE_ADMIN, project); @@ -250,7 +250,7 @@ public class GroupsActionIT extends BasePermissionWsIT { @Test public void return_anyone_group_when_search_query_and_no_param_permission() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); GroupDto group = db.users().insertGroup("group-with-permission"); db.users().insertProjectPermissionOnGroup(group, ISSUE_ADMIN, project); @@ -345,7 +345,7 @@ public class GroupsActionIT extends BasePermissionWsIT { @Test public void fail_if_project_uuid_and_project_key_are_provided() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); assertThatThrownBy(() -> { loginAsAdmin(); @@ -360,7 +360,7 @@ public class GroupsActionIT extends BasePermissionWsIT { @Test public void fail_when_using_branch_uuid() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto branch = db.components().insertProjectBranch(project); GroupDto group = db.users().insertGroup(); db.users().insertProjectPermissionOnGroup(group, ISSUE_ADMIN, project); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/permission/ws/RemoveGroupActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/permission/ws/RemoveGroupActionIT.java index c82e1e50026..5b9fcfd9d9d 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/permission/ws/RemoveGroupActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/permission/ws/RemoveGroupActionIT.java @@ -95,7 +95,7 @@ public class RemoveGroupActionIT extends BasePermissionWsIT { @Test public void remove_project_permission() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); db.users().insertPermissionOnGroup(aGroup, GlobalPermission.ADMINISTER); db.users().insertProjectPermissionOnGroup(aGroup, UserRole.ADMIN, project); db.users().insertProjectPermissionOnGroup(aGroup, UserRole.ISSUE_ADMIN, project); @@ -131,7 +131,7 @@ public class RemoveGroupActionIT extends BasePermissionWsIT { @Test public void remove_with_project_key() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); db.users().insertPermissionOnGroup(aGroup, GlobalPermission.ADMINISTER); db.users().insertProjectPermissionOnGroup(aGroup, UserRole.ADMIN, project); db.users().insertProjectPermissionOnGroup(aGroup, UserRole.ISSUE_ADMIN, project); @@ -187,7 +187,7 @@ public class RemoveGroupActionIT extends BasePermissionWsIT { @Test public void fail_when_component_is_a_directory() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newDirectory(project, "A/B")); failIfComponentIsNotAProjectOrView(file); @@ -195,7 +195,7 @@ public class RemoveGroupActionIT extends BasePermissionWsIT { @Test public void fail_when_component_is_a_file() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project, null, "file-uuid")); failIfComponentIsNotAProjectOrView(file); @@ -203,7 +203,7 @@ public class RemoveGroupActionIT extends BasePermissionWsIT { @Test public void fail_when_component_is_a_subview() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newSubPortfolio(project)); failIfComponentIsNotAProjectOrView(file); @@ -251,7 +251,7 @@ public class RemoveGroupActionIT extends BasePermissionWsIT { @Test public void fail_when_project_uuid_and_project_key_are_provided() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); loginAsAdmin(); assertThatThrownBy(() -> { @@ -288,7 +288,7 @@ public class RemoveGroupActionIT extends BasePermissionWsIT { @Test public void removing_project_permission_fails_if_not_administrator_of_project() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.logIn(); assertThatThrownBy(() -> { @@ -306,7 +306,7 @@ public class RemoveGroupActionIT extends BasePermissionWsIT { */ @Test public void removing_project_permission_is_allowed_to_project_administrators() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); db.users().insertProjectPermissionOnGroup(aGroup, UserRole.CODEVIEWER, project); db.users().insertProjectPermissionOnGroup(aGroup, UserRole.ISSUE_ADMIN, project); @@ -322,7 +322,7 @@ public class RemoveGroupActionIT extends BasePermissionWsIT { @Test public void no_effect_when_removing_any_permission_from_group_AnyOne_on_a_private_project() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); permissionService.getAllProjectPermissions() .forEach(perm -> unsafeInsertProjectPermissionOnAnyone(perm, project)); userSession.logIn().addProjectPermission(UserRole.ADMIN, project); @@ -341,7 +341,7 @@ public class RemoveGroupActionIT extends BasePermissionWsIT { @Test public void fail_when_removing_USER_permission_from_group_AnyOne_on_a_public_project() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); userSession.logIn().addProjectPermission(UserRole.ADMIN, project); assertThatThrownBy(() -> { @@ -357,7 +357,7 @@ public class RemoveGroupActionIT extends BasePermissionWsIT { @Test public void fail_when_removing_CODEVIEWER_permission_from_group_AnyOne_on_a_public_project() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); userSession.logIn().addProjectPermission(UserRole.ADMIN, project); assertThatThrownBy(() -> { @@ -374,7 +374,7 @@ public class RemoveGroupActionIT extends BasePermissionWsIT { @Test public void fail_when_removing_USER_permission_from_group_on_a_public_project() { GroupDto group = db.users().insertGroup(); - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); userSession.logIn().addProjectPermission(UserRole.ADMIN, project); assertThatThrownBy(() -> { @@ -391,7 +391,7 @@ public class RemoveGroupActionIT extends BasePermissionWsIT { @Test public void fail_when_removing_CODEVIEWER_permission_from_group_on_a_public_project() { GroupDto group = db.users().insertGroup(); - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); userSession.logIn().addProjectPermission(UserRole.ADMIN, project); assertThatThrownBy(() -> { @@ -408,7 +408,7 @@ public class RemoveGroupActionIT extends BasePermissionWsIT { @Test public void fail_when_using_branch_uuid() { GroupDto group = db.users().insertGroup(); - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); userSession.logIn().addProjectPermission(UserRole.ADMIN, project); ComponentDto branch = db.components().insertProjectBranch(project); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/permission/ws/RemoveUserActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/permission/ws/RemoveUserActionIT.java index 8d15fbeabf9..229227f87ad 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/permission/ws/RemoveUserActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/permission/ws/RemoveUserActionIT.java @@ -102,7 +102,7 @@ public class RemoveUserActionIT extends BasePermissionWsIT { public void project_admin_can_not_remove_his_project_admin_right() { loginAsAdmin(); UserDto admin = db.users().insertUser(userSession.getLogin()); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); db.users().insertProjectPermissionOnUser(admin, GlobalPermission.ADMINISTER.getKey(), project); TestRequest request = newRequest() @@ -132,7 +132,7 @@ public class RemoveUserActionIT extends BasePermissionWsIT { @Test public void remove_permission_from_project() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); db.users().insertProjectPermissionOnUser(user, UserRole.CODEVIEWER, project); db.users().insertProjectPermissionOnUser(user, UserRole.ISSUE_ADMIN, project); loginAsAdmin(); @@ -148,7 +148,7 @@ public class RemoveUserActionIT extends BasePermissionWsIT { @Test public void remove_with_project_key() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); db.users().insertProjectPermissionOnUser(user, UserRole.ISSUE_ADMIN, project); db.users().insertProjectPermissionOnUser(user, UserRole.CODEVIEWER, project); loginAsAdmin(); @@ -207,7 +207,7 @@ public class RemoveUserActionIT extends BasePermissionWsIT { @Test public void fail_when_component_is_a_directory() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newDirectory(project, "A/B")); failIfComponentIsNotAProjectOrView(file); @@ -215,7 +215,7 @@ public class RemoveUserActionIT extends BasePermissionWsIT { @Test public void fail_when_component_is_a_file() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project, null, "file-uuid")); failIfComponentIsNotAProjectOrView(file); @@ -283,7 +283,7 @@ public class RemoveUserActionIT extends BasePermissionWsIT { @Test public void fail_when_project_uuid_and_project_key_are_provided() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); loginAsAdmin(); assertThatThrownBy(() -> { @@ -313,7 +313,7 @@ public class RemoveUserActionIT extends BasePermissionWsIT { @Test public void removing_project_permission_fails_if_not_administrator_of_project() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.logIn(); assertThatThrownBy(() -> { @@ -331,7 +331,7 @@ public class RemoveUserActionIT extends BasePermissionWsIT { */ @Test public void removing_project_permission_is_allowed_to_project_administrators() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); db.users().insertProjectPermissionOnUser(user, UserRole.CODEVIEWER, project); db.users().insertProjectPermissionOnUser(user, UserRole.ISSUE_ADMIN, project); userSession.logIn().addProjectPermission(UserRole.ADMIN, project); @@ -347,7 +347,7 @@ public class RemoveUserActionIT extends BasePermissionWsIT { @Test public void fail_when_removing_USER_permission_on_a_public_project() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); userSession.logIn().addProjectPermission(UserRole.ADMIN, project); assertThatThrownBy(() -> { @@ -364,7 +364,7 @@ public class RemoveUserActionIT extends BasePermissionWsIT { @Test public void fail_when_removing_CODEVIEWER_permission_on_a_public_project() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); userSession.logIn().addProjectPermission(UserRole.ADMIN, project); assertThatThrownBy(() -> { @@ -380,7 +380,7 @@ public class RemoveUserActionIT extends BasePermissionWsIT { @Test public void fail_when_using_branch_uuid() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); userSession.logIn().addProjectPermission(UserRole.ADMIN, project); ComponentDto branch = db.components().insertProjectBranch(project); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/permission/ws/UsersActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/permission/ws/UsersActionIT.java index c9a9eecf57d..fd907b5cdd2 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/permission/ws/UsersActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/permission/ws/UsersActionIT.java @@ -102,12 +102,12 @@ public class UsersActionIT extends BasePermissionWsIT { @Test public void search_for_users_with_permission_on_project() { // User has permission on project - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); UserDto user = db.users().insertUser(newUserDto()); db.users().insertProjectPermissionOnUser(user, UserRole.ISSUE_ADMIN, project); // User has permission on another project - ComponentDto anotherProject = db.components().insertPrivateProject(); + ComponentDto anotherProject = db.components().insertPrivateProject().getMainBranchComponent(); UserDto userHavePermissionOnAnotherProject = db.users().insertUser(newUserDto()); db.users().insertProjectPermissionOnUser(userHavePermissionOnAnotherProject, UserRole.ISSUE_ADMIN, anotherProject); @@ -129,7 +129,7 @@ public class UsersActionIT extends BasePermissionWsIT { @Test public void search_also_for_users_without_permission_when_filtering_name() { // User with permission on project - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); UserDto user = db.users().insertUser(newUserDto("with-permission-login", "with-permission-name", "with-permission-email")); db.users().insertProjectPermissionOnUser(user, UserRole.ISSUE_ADMIN, project); @@ -150,7 +150,7 @@ public class UsersActionIT extends BasePermissionWsIT { @Test public void search_also_for_users_without_permission_when_filtering_email() { // User with permission on project - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); UserDto user = db.users().insertUser(newUserDto("with-permission-login", "with-permission-name", "with-permission-email")); db.users().insertProjectPermissionOnUser(user, UserRole.ISSUE_ADMIN, project); @@ -167,7 +167,7 @@ public class UsersActionIT extends BasePermissionWsIT { @Test public void search_also_for_users_without_permission_when_filtering_login() { // User with permission on project - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); UserDto user = db.users().insertUser(newUserDto("with-permission-login", "with-permission-name", "with-permission-email")); db.users().insertProjectPermissionOnUser(user, UserRole.ISSUE_ADMIN, project); @@ -306,7 +306,7 @@ public class UsersActionIT extends BasePermissionWsIT { @Test public void fail_if_project_uuid_and_project_key_are_provided() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); loginAsAdmin(); assertThatThrownBy(() -> { @@ -332,7 +332,7 @@ public class UsersActionIT extends BasePermissionWsIT { @Test public void fail_when_using_branch_uuid() { UserDto user = db.users().insertUser(newUserDto()); - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto branch = db.components().insertProjectBranch(project); db.users().insertProjectPermissionOnUser(user, UserRole.ISSUE_ADMIN, project); userSession.logIn().addProjectPermission(UserRole.ADMIN, project); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/permission/ws/template/ApplyTemplateActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/permission/ws/template/ApplyTemplateActionIT.java index 7c9770ac0f6..d6afdc57f73 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/permission/ws/template/ApplyTemplateActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/permission/ws/template/ApplyTemplateActionIT.java @@ -97,7 +97,7 @@ public class ApplyTemplateActionIT extends BasePermissionWsIT a.setCreatedAt(parseDate("2015-02-03").getTime())); db.components().insertSnapshot(oldProject2, a -> a.setCreatedAt(parseDate("2016-12-11").getTime())); db.components().insertSnapshot(recentProject, a -> a.setCreatedAt(System.currentTimeMillis())); @@ -274,9 +273,9 @@ public class BulkApplyTemplateActionIT extends BasePermissionWsIT db.components().insertPrivateProject()).toArray(ComponentDto[]::new); + ComponentDto[] projects = IntStream.range(0, 55).mapToObj(i -> db.components().insertPrivateProject().getMainBranchComponent()).toArray(ComponentDto[]::new); List projectKeys = Stream.of(projects).map(ComponentDto::getKey).collect(Collectors.toList()); ws.newRequest().setParam(PARAM_PROJECTS, String.join(",", projectKeys)).execute(); @@ -192,7 +192,7 @@ public class BulkDeleteActionIT { @Test public void projects_and_views() { userSession.logIn().addPermission(ADMINISTER); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto view = db.components().insertPrivatePortfolio(); ws.newRequest() @@ -207,9 +207,9 @@ public class BulkDeleteActionIT { @Test public void delete_by_key_query_with_partial_match_case_insensitive() { userSession.logIn().addPermission(ADMINISTER); - ComponentDto matchKeyProject = db.components().insertPrivateProject(p -> p.setKey("project-_%-key")); - ComponentDto matchUppercaseKeyProject = db.components().insertPrivateProject(p -> p.setKey("PROJECT-_%-KEY")); - ComponentDto noMatchProject = db.components().insertPrivateProject(p -> p.setKey("project-key-without-escaped-characters")); + ComponentDto matchKeyProject = db.components().insertPrivateProject(p -> p.setKey("project-_%-key")).getMainBranchComponent(); + ComponentDto matchUppercaseKeyProject = db.components().insertPrivateProject(p -> p.setKey("PROJECT-_%-KEY")).getMainBranchComponent(); + ComponentDto noMatchProject = db.components().insertPrivateProject(p -> p.setKey("project-key-without-escaped-characters")).getMainBranchComponent(); ws.newRequest().setParam(Param.TEXT_QUERY, "JeCt-_%-k").execute(); @@ -224,7 +224,7 @@ public class BulkDeleteActionIT { public void delete_only_the_1000_first_projects() { userSession.logIn().addPermission(ADMINISTER); List keys = IntStream.range(0, 1_010).mapToObj(i -> "key" + i).collect(MoreCollectors.toArrayList()); - keys.forEach(key -> db.components().insertPrivateProject(p -> p.setKey(key))); + keys.forEach(key -> db.components().insertPrivateProject(p -> p.setKey(key)).getMainBranchComponent()); ws.newRequest() .setParam("projects", StringUtils.join(keys, ",")) @@ -239,9 +239,9 @@ public class BulkDeleteActionIT { @Test public void projectLifeCycleListeners_onProjectsDeleted_called_even_if_delete_fails() { userSession.logIn().addPermission(ADMINISTER); - ComponentDto project1 = db.components().insertPrivateProject(); - ComponentDto project2 = db.components().insertPrivateProject(); - ComponentDto project3 = db.components().insertPrivateProject(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project3 = db.components().insertPrivateProject().getMainBranchComponent(); ComponentCleanerService componentCleanerService = mock(ComponentCleanerService.class); RuntimeException expectedException = new RuntimeException("Faking delete failing on 2nd project"); doNothing() @@ -262,8 +262,8 @@ public class BulkDeleteActionIT { @Test public void global_administrator_deletes_projects_by_keys() { userSession.logIn().addPermission(ADMINISTER); - ComponentDto toDelete1 = db.components().insertPrivateProject(); - ComponentDto toDelete2 = db.components().insertPrivateProject(); + ComponentDto toDelete1 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto toDelete2 = db.components().insertPrivateProject().getMainBranchComponent(); ws.newRequest() .setParam("projects", toDelete1.getKey() + "," + toDelete2.getKey()) @@ -279,9 +279,9 @@ public class BulkDeleteActionIT { Date now = new Date(); Date futureDate = new DateTime(now).plusDays(RandomUtils.nextInt() + 1).toDate(); - ComponentDto project1 = db.components().insertPublicProject(); + ComponentDto project1 = db.components().insertPublicProject().getMainBranchComponent(); db.getDbClient().snapshotDao().insert(db.getSession(), newAnalysis(project1).setCreatedAt(now.getTime())); - ComponentDto project2 = db.components().insertPublicProject(); + ComponentDto project2 = db.components().insertPublicProject().getMainBranchComponent(); db.getDbClient().snapshotDao().insert(db.getSession(), newAnalysis(project2).setCreatedAt(now.getTime())); db.commit(); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/project/ws/CreateActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/project/ws/CreateActionIT.java index 366270db444..f7b89e93976 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/project/ws/CreateActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/project/ws/CreateActionIT.java @@ -207,7 +207,7 @@ public class CreateActionIT { public void do_not_add_project_to_user_favorites_if_project_creator_is_defined_in_permission_template_and_already_100_favorites() { UserDto user = db.users().insertUser(); when(permissionTemplateService.hasDefaultTemplateWithPermissionOnProjectCreator(any(DbSession.class), any(ComponentDto.class))).thenReturn(true); - rangeClosed(1, 100).forEach(i -> db.favorites().add(db.components().insertPrivateProject(), user.getUuid(), user.getLogin())); + rangeClosed(1, 100).forEach(i -> db.favorites().add(db.components().insertPrivateProject().getMainBranchComponent(), user.getUuid(), user.getLogin())); userSession.logIn(user).addPermission(PROVISION_PROJECTS); ws.newRequest() @@ -221,7 +221,7 @@ public class CreateActionIT { @Test public void fail_when_project_already_exists() { - db.components().insertPublicProject(project -> project.setKey(DEFAULT_PROJECT_KEY)); + db.components().insertPublicProject(project -> project.setKey(DEFAULT_PROJECT_KEY)).getMainBranchComponent(); userSession.addPermission(PROVISION_PROJECTS); CreateRequest request = CreateRequest.builder() diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/project/ws/DeleteActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/project/ws/DeleteActionIT.java index 964bec95ef3..ba9474a1be9 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/project/ws/DeleteActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/project/ws/DeleteActionIT.java @@ -82,7 +82,7 @@ public class DeleteActionIT { @Test public void global_administrator_deletes_project_by_key() { - ComponentDto project = componentDbTester.insertPrivateProject(); + ComponentDto project = componentDbTester.insertPrivateProject().getMainBranchComponent(); userSessionRule.logIn().addPermission(GlobalPermission.ADMINISTER); call(tester.newRequest().setParam(PARAM_PROJECT, project.getKey())); @@ -93,7 +93,7 @@ public class DeleteActionIT { @Test public void project_administrator_deletes_the_project_by_key() { - ComponentDto project = componentDbTester.insertPrivateProject(); + ComponentDto project = componentDbTester.insertPrivateProject().getMainBranchComponent(); userSessionRule.logIn().addProjectPermission(UserRole.ADMIN, project); call(tester.newRequest().setParam(PARAM_PROJECT, project.getKey())); @@ -104,7 +104,7 @@ public class DeleteActionIT { @Test public void project_deletion_also_ensure_that_homepage_on_this_project_if_it_exists_is_cleared() { - ComponentDto project = componentDbTester.insertPrivateProject(); + ComponentDto project = componentDbTester.insertPrivateProject().getMainBranchComponent(); UserDto insert = dbClient.userDao().insert(dbSession, newUserDto().setHomepageType("PROJECT").setHomepageParameter(project.uuid())); dbSession.commit(); @@ -125,7 +125,7 @@ public class DeleteActionIT { @Test public void project_deletion_also_ensure_that_webhooks_on_this_project_if_they_exists_are_deleted() { - ProjectDto project = componentDbTester.insertPrivateProjectDto(); + ProjectDto project = componentDbTester.insertPrivateProject().getProjectDto(); webhookDbTester.insertWebhook(project); webhookDbTester.insertWebhook(project); webhookDbTester.insertWebhook(project); @@ -147,7 +147,7 @@ public class DeleteActionIT { @Test public void return_403_if_not_project_admin_nor_org_admin() { - ComponentDto project = componentDbTester.insertPrivateProject(); + ComponentDto project = componentDbTester.insertPrivateProject().getMainBranchComponent(); userSessionRule.logIn() .addProjectPermission(UserRole.CODEVIEWER, project) @@ -161,7 +161,7 @@ public class DeleteActionIT { @Test public void return_401_if_not_logged_in() { - ComponentDto project = componentDbTester.insertPrivateProject(); + ComponentDto project = componentDbTester.insertPrivateProject().getMainBranchComponent(); userSessionRule.anonymous(); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/project/ws/ProjectFinderIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/project/ws/ProjectFinderIT.java index eefcfad3689..eb49f1d6726 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/project/ws/ProjectFinderIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/project/ws/ProjectFinderIT.java @@ -43,9 +43,9 @@ public class ProjectFinderIT { @Test public void selected_projects() { - ProjectDto project1 = db.components().insertPrivateProjectDto(); - ProjectDto project2 = db.components().insertPrivateProjectDto(); - ProjectDto project3 = db.components().insertPrivateProjectDto(); + ProjectDto project1 = db.components().insertPrivateProject().getProjectDto(); + ProjectDto project2 = db.components().insertPrivateProject().getProjectDto(); + ProjectDto project3 = db.components().insertPrivateProject().getProjectDto(); userSession.addProjectPermission(SCAN, project1, project2); List projects = underTest.search(db.getSession(), "").getProjects(); @@ -58,10 +58,10 @@ public class ProjectFinderIT { @Test public void sort_project_by_name() { - ProjectDto project1 = db.components().insertPrivateProjectDto(p -> p.setKey("project:one").setName("Projet Un")); - ProjectDto project2 = db.components().insertPrivateProjectDto(p -> p.setKey("project:two").setName("Projet Deux")); - ProjectDto project3 = db.components().insertPrivateProjectDto(p -> p.setKey("project:three").setName("Projet Trois")); - ProjectDto project4 = db.components().insertPrivateProjectDto(p -> p.setKey("project:four").setName("Projet Quatre")); + ProjectDto project1 = db.components().insertPrivateProject(p -> p.setKey("project:one").setName("Projet Un")).getProjectDto(); + ProjectDto project2 = db.components().insertPrivateProject(p -> p.setKey("project:two").setName("Projet Deux")).getProjectDto(); + ProjectDto project3 = db.components().insertPrivateProject(p -> p.setKey("project:three").setName("Projet Trois")).getProjectDto(); + ProjectDto project4 = db.components().insertPrivateProject(p -> p.setKey("project:four").setName("Projet Quatre")).getProjectDto(); userSession.addProjectPermission(SCAN, project1, project2, project3, project4); assertThat(underTest.search(db.getSession(), "projet") @@ -72,11 +72,11 @@ public class ProjectFinderIT { @Test public void projects_are_filtered_by_permissions() { - ProjectDto project1 = db.components().insertPrivateProjectDto(p -> p.setKey("project:one").setName("Projet Un")); - ProjectDto project2 = db.components().insertPrivateProjectDto(p -> p.setKey("project:two").setName("Projet Deux")); - ProjectDto project3 = db.components().insertPrivateProjectDto(p -> p.setKey("project:three").setName("Projet Trois")); - ProjectDto project4 = db.components().insertPrivateProjectDto(p -> p.setKey("project:four").setName("Projet Quatre")); - db.components().insertPrivateProjectDto(p -> p.setKey("project:five").setName("Projet Cinq")); + ProjectDto project1 = db.components().insertPrivateProject(p -> p.setKey("project:one").setName("Projet Un")).getProjectDto(); + ProjectDto project2 = db.components().insertPrivateProject(p -> p.setKey("project:two").setName("Projet Deux")).getProjectDto(); + ProjectDto project3 = db.components().insertPrivateProject(p -> p.setKey("project:three").setName("Projet Trois")).getProjectDto(); + ProjectDto project4 = db.components().insertPrivateProject(p -> p.setKey("project:four").setName("Projet Quatre")).getProjectDto(); + db.components().insertPrivateProject(p -> p.setKey("project:five").setName("Projet Cinq")).getProjectDto(); userSession.addProjectPermission(SCAN, project1, project2, project3, project4); @@ -93,11 +93,11 @@ public class ProjectFinderIT { @Test public void projects_are_not_filtered_due_to_global_scan_permission() { - db.components().insertPrivateProjectDto(p -> p.setKey("project:one").setName("Projet Un")); - db.components().insertPrivateProjectDto(p -> p.setKey("project:two").setName("Projet Deux")); - db.components().insertPrivateProjectDto(p -> p.setKey("project:three").setName("Projet Trois")); - db.components().insertPrivateProjectDto(p -> p.setKey("project:four").setName("Projet Quatre")); - db.components().insertPrivateProjectDto(p -> p.setKey("project:five").setName("Projet Cinq")); + db.components().insertPrivateProject(p -> p.setKey("project:one").setName("Projet Un")).getProjectDto(); + db.components().insertPrivateProject(p -> p.setKey("project:two").setName("Projet Deux")).getProjectDto(); + db.components().insertPrivateProject(p -> p.setKey("project:three").setName("Projet Trois")).getProjectDto(); + db.components().insertPrivateProject(p -> p.setKey("project:four").setName("Projet Quatre")).getProjectDto(); + db.components().insertPrivateProject(p -> p.setKey("project:five").setName("Projet Cinq")).getProjectDto(); userSession.addPermission(GlobalPermission.SCAN); @@ -115,10 +115,10 @@ public class ProjectFinderIT { @Test public void search_by_query_on_name_case_insensitive() { - ProjectDto project1 = db.components().insertPrivateProjectDto(p -> p.setKey("project:one").setName("Projet Un")); - ProjectDto project2 = db.components().insertPrivateProjectDto(p -> p.setKey("project:two").setName("Projet Deux")); - ProjectDto project3 = db.components().insertPrivateProjectDto(p -> p.setKey("project:three").setName("Projet Trois")); - ProjectDto project4 = db.components().insertPrivateProjectDto(p -> p.setKey("project:four").setName("Projet Quatre")); + ProjectDto project1 = db.components().insertPrivateProject(p -> p.setKey("project:one").setName("Projet Un")).getProjectDto(); + ProjectDto project2 = db.components().insertPrivateProject(p -> p.setKey("project:two").setName("Projet Deux")).getProjectDto(); + ProjectDto project3 = db.components().insertPrivateProject(p -> p.setKey("project:three").setName("Projet Trois")).getProjectDto(); + ProjectDto project4 = db.components().insertPrivateProject(p -> p.setKey("project:four").setName("Projet Quatre")).getProjectDto(); userSession.addProjectPermission(SCAN, project1, project2, project3, project4); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/project/ws/SearchActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/project/ws/SearchActionIT.java index d35222efc64..14c69602047 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/project/ws/SearchActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/project/ws/SearchActionIT.java @@ -34,7 +34,6 @@ import org.sonar.api.server.ws.WebService.Param; import org.sonar.api.utils.DateUtils; import org.sonar.db.DbTester; import org.sonar.db.component.ComponentDto; -import org.sonar.db.component.ComponentTesting; import org.sonar.server.exceptions.ForbiddenException; import org.sonar.server.tester.UserSessionRule; import org.sonar.server.ws.TestRequest; @@ -85,9 +84,9 @@ public class SearchActionIT { @Test public void search_by_key_query_with_partial_match_case_insensitive() { userSession.addPermission(ADMINISTER); - db.components().insertPrivateProject(p -> p.setKey("project-_%-key")); - db.components().insertPrivateProject(p -> p.setKey("PROJECT-_%-KEY")); - db.components().insertPrivateProject(p -> p.setKey("project-key-without-escaped-characters")); + db.components().insertPrivateProject(p -> p.setKey("project-_%-key")).getMainBranchComponent(); + db.components().insertPrivateProject(p -> p.setKey("PROJECT-_%-KEY")).getMainBranchComponent(); + db.components().insertPrivateProject(p -> p.setKey("project-key-without-escaped-characters")).getMainBranchComponent(); SearchWsResponse response = call(SearchRequest.builder().setQuery("JeCt-_%-k").build()); @@ -97,8 +96,8 @@ public class SearchActionIT { @Test public void search_private_projects() { userSession.addPermission(ADMINISTER); - db.components().insertPrivateProject(p -> p.setKey("private-key")); - db.components().insertPublicProject(p -> p.setKey("public-key")); + db.components().insertPrivateProject(p -> p.setKey("private-key")).getMainBranchComponent(); + db.components().insertPublicProject(p -> p.setKey("public-key")).getMainBranchComponent(); SearchWsResponse response = call(SearchRequest.builder().setVisibility("private").build()); @@ -108,8 +107,8 @@ public class SearchActionIT { @Test public void search_public_projects() { userSession.addPermission(ADMINISTER); - db.components().insertPrivateProject(p -> p.setKey("private-key")); - db.components().insertPublicProject(p -> p.setKey("public-key")); + db.components().insertPrivateProject(p -> p.setKey("private-key")).getMainBranchComponent(); + db.components().insertPublicProject(p -> p.setKey("public-key")).getMainBranchComponent(); SearchWsResponse response = call(SearchRequest.builder().setVisibility("public").build()); @@ -119,7 +118,7 @@ public class SearchActionIT { @Test public void search_projects_when_no_qualifier_set() { userSession.addPermission(ADMINISTER); - db.components().insertPrivateProject(p -> p.setKey(PROJECT_KEY_1)); + db.components().insertPrivateProject(p -> p.setKey(PROJECT_KEY_1)).getMainBranchComponent(); db.components().insertPublicPortfolio(); SearchWsResponse response = call(SearchRequest.builder().build()); @@ -130,8 +129,8 @@ public class SearchActionIT { @Test public void search_projects() { userSession.addPermission(ADMINISTER); - ComponentDto project = db.components().insertPrivateProject(p -> p.setKey(PROJECT_KEY_1)); - db.components().insertPrivateProject(p -> p.setKey(PROJECT_KEY_2)); + ComponentDto project = db.components().insertPrivateProject(p -> p.setKey(PROJECT_KEY_1)).getMainBranchComponent(); + db.components().insertPrivateProject(p -> p.setKey(PROJECT_KEY_2)).getMainBranchComponent(); db.components().insertPublicPortfolio(); ComponentDto directory = newDirectory(project, "dir"); @@ -146,7 +145,7 @@ public class SearchActionIT { @Test public void search_views() { userSession.addPermission(ADMINISTER); - db.components().insertPrivateProject(p -> p.setKey(PROJECT_KEY_1)); + db.components().insertPrivateProject(p -> p.setKey(PROJECT_KEY_1)).getMainBranchComponent(); db.components().insertPublicPortfolio(p -> p.setKey("view1")); SearchWsResponse response = call(SearchRequest.builder().setQualifiers(singletonList("VW")).build()); @@ -157,7 +156,7 @@ public class SearchActionIT { @Test public void search_projects_and_views() { userSession.addPermission(ADMINISTER); - db.components().insertPrivateProject(p -> p.setKey(PROJECT_KEY_1)); + db.components().insertPrivateProject(p -> p.setKey(PROJECT_KEY_1)).getMainBranchComponent(); db.components().insertPublicPortfolio(p -> p.setKey("view1")); SearchWsResponse response = call(SearchRequest.builder().setQualifiers(asList("TRK", "VW")).build()); @@ -168,9 +167,9 @@ public class SearchActionIT { @Test public void search_all() { userSession.addPermission(ADMINISTER); - db.components().insertPrivateProject(p -> p.setKey(PROJECT_KEY_1)); - db.components().insertPrivateProject(p -> p.setKey(PROJECT_KEY_2)); - db.components().insertPrivateProject(p -> p.setKey(PROJECT_KEY_3)); + db.components().insertPrivateProject(p -> p.setKey(PROJECT_KEY_1)).getMainBranchComponent(); + db.components().insertPrivateProject(p -> p.setKey(PROJECT_KEY_2)).getMainBranchComponent(); + db.components().insertPrivateProject(p -> p.setKey(PROJECT_KEY_3)).getMainBranchComponent(); SearchWsResponse response = call(SearchRequest.builder().build()); assertThat(response.getComponentsList()).extracting(Component::getKey).containsOnly(PROJECT_KEY_1, PROJECT_KEY_2, PROJECT_KEY_3); @@ -183,12 +182,12 @@ public class SearchActionIT { long inBetween = 2_000_000_000L; long recentTime = 3_000_000_000L; - ComponentDto oldProject = db.components().insertPublicProject(); + ComponentDto oldProject = db.components().insertPublicProject().getMainBranchComponent(); db.getDbClient().snapshotDao().insert(db.getSession(), newAnalysis(oldProject).setCreatedAt(aLongTimeAgo)); ComponentDto branch = db.components().insertProjectBranch(oldProject); db.getDbClient().snapshotDao().insert(db.getSession(), newAnalysis(branch).setCreatedAt(inBetween)); - ComponentDto recentProject = db.components().insertPublicProject(); + ComponentDto recentProject = db.components().insertPublicProject().getMainBranchComponent(); db.getDbClient().snapshotDao().insert(db.getSession(), newAnalysis(recentProject).setCreatedAt(recentTime)); db.commit(); @@ -211,7 +210,7 @@ public class SearchActionIT { @Test public void does_not_return_branches_when_searching_by_key() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto branch = db.components().insertProjectBranch(project); userSession.addPermission(ADMINISTER); @@ -226,7 +225,7 @@ public class SearchActionIT { List componentDtoList = new ArrayList<>(); for (int i = 1; i <= 9; i++) { int j = i; - componentDtoList.add(db.components().insertPrivateProject("project-uuid-" + i, p -> p.setKey("project-key-" + j).setName("Project Name " + j))); + componentDtoList.add(db.components().insertPrivateProject("project-uuid-" + i, p -> p.setKey("project-key-" + j).setName("Project Name " + j)).getMainBranchComponent()); } SearchWsResponse response = call(SearchRequest.builder().setPage(2).setPageSize(3).build()); @@ -236,8 +235,8 @@ public class SearchActionIT { @Test public void provisioned_projects() { userSession.addPermission(ADMINISTER); - ComponentDto provisionedProject = db.components().insertPrivateProject(); - ComponentDto analyzedProject = db.components().insertPrivateProject(); + ComponentDto provisionedProject = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto analyzedProject = db.components().insertPrivateProject().getMainBranchComponent(); db.components().insertSnapshot(newAnalysis(analyzedProject)); SearchWsResponse response = call(SearchRequest.builder().setOnProvisionedOnly(true).build()); @@ -250,9 +249,9 @@ public class SearchActionIT { @Test public void search_by_component_keys() { userSession.addPermission(ADMINISTER); - ComponentDto jdk = db.components().insertPrivateProject(); - ComponentDto sonarqube = db.components().insertPrivateProject(); - ComponentDto sonarlint = db.components().insertPrivateProject(); + ComponentDto jdk = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto sonarqube = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto sonarlint = db.components().insertPrivateProject().getMainBranchComponent(); SearchWsResponse result = call(SearchRequest.builder() .setProjects(Arrays.asList(jdk.getKey(), sonarqube.getKey())) @@ -347,8 +346,8 @@ public class SearchActionIT { @Test public void json_example() { userSession.addPermission(ADMINISTER); - ComponentDto publicProject = db.components().insertPublicProject("project-uuid-1", p -> p.setName("Project Name 1").setKey("project-key-1").setPrivate(false)); - ComponentDto privateProject = db.components().insertPrivateProject("project-uuid-2", p->p.setName("Project Name 1").setKey("project-key-2")); + ComponentDto publicProject = db.components().insertPublicProject("project-uuid-1", p -> p.setName("Project Name 1").setKey("project-key-1").setPrivate(false)).getMainBranchComponent(); + ComponentDto privateProject = db.components().insertPrivateProject("project-uuid-2", p -> p.setName("Project Name 1").setKey("project-key-2")).getMainBranchComponent(); db.getDbClient().snapshotDao().insert(db.getSession(), newAnalysis(publicProject) .setCreatedAt(parseDateTime("2017-03-01T11:39:03+0300").getTime()) .setRevision("cfb82f55c6ef32e61828c4cb3db2da12795fd767")); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/project/ws/SearchMyProjectsActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/project/ws/SearchMyProjectsActionIT.java index 4f73015cef9..5c0e9f88684 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/project/ws/SearchMyProjectsActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/project/ws/SearchMyProjectsActionIT.java @@ -116,7 +116,7 @@ public class SearchMyProjectsActionIT { @Test public void return_only_first_1000_projects() { IntStream.range(0, 1_010).forEach(i -> { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); db.users().insertProjectPermissionOnUser(user, UserRole.ADMIN, project); }); @@ -127,9 +127,9 @@ public class SearchMyProjectsActionIT { @Test public void sort_projects_by_name() { - ComponentDto b_project = db.components().insertPrivateProject(p -> p.setName("B_project_name")); - ComponentDto c_project = db.components().insertPrivateProject(p -> p.setName("c_project_name")); - ComponentDto a_project = db.components().insertPrivateProject(p -> p.setName("A_project_name")); + ComponentDto b_project = db.components().insertPrivateProject(p -> p.setName("B_project_name")).getMainBranchComponent(); + ComponentDto c_project = db.components().insertPrivateProject(p -> p.setName("c_project_name")).getMainBranchComponent(); + ComponentDto a_project = db.components().insertPrivateProject(p -> p.setName("A_project_name")).getMainBranchComponent(); db.users().insertProjectPermissionOnUser(user, UserRole.ADMIN, b_project); db.users().insertProjectPermissionOnUser(user, UserRole.ADMIN, a_project); @@ -144,7 +144,7 @@ public class SearchMyProjectsActionIT { public void paginate_projects() { for (int i = 0; i < 10; i++) { int j = i; - ComponentDto project = db.components().insertPrivateProject(p -> p.setName("project-" + j)); + ComponentDto project = db.components().insertPrivateProject(p -> p.setName("project-" + j)).getMainBranchComponent(); db.users().insertProjectPermissionOnUser(user, UserRole.ADMIN, project); } @@ -185,7 +185,7 @@ public class SearchMyProjectsActionIT { @Test public void does_not_return_branches() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto branch = db.components().insertProjectBranch(project); db.users().insertProjectPermissionOnUser(user, UserRole.ADMIN, project); @@ -216,7 +216,7 @@ public class SearchMyProjectsActionIT { public void admin_via_groups_and_users() { ComponentDto jdk7 = insertJdk7(); ComponentDto cLang = insertClang(); - ComponentDto sonarqube = db.components().insertPrivateProject(); + ComponentDto sonarqube = db.components().insertPrivateProject().getMainBranchComponent(); GroupDto group = db.users().insertGroup(); db.users().insertMember(group, user); @@ -249,14 +249,14 @@ public class SearchMyProjectsActionIT { private ComponentDto insertClang() { return db.components().insertPrivateProject(Uuids.UUID_EXAMPLE_01, p -> p .setName("Clang") - .setKey("clang")); + .setKey("clang")).getMainBranchComponent(); } private ComponentDto insertJdk7() { return db.components().insertPrivateProject(Uuids.UUID_EXAMPLE_02, p -> p .setName("JDK 7") .setKey("net.java.openjdk:jdk7") - .setDescription("JDK")); + .setDescription("JDK")).getMainBranchComponent(); } private ComponentDto insertPortfolio() { diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/project/ws/SearchMyScannableProjectsActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/project/ws/SearchMyScannableProjectsActionIT.java index 969a76350db..c0cf046d05c 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/project/ws/SearchMyScannableProjectsActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/project/ws/SearchMyScannableProjectsActionIT.java @@ -51,10 +51,10 @@ public class SearchMyScannableProjectsActionIT { @Test public void projects_filtered_by_query() { - ProjectDto project1 = db.components().insertPrivateProjectDto(p -> p.setKey("project:one").setName("Projet Un")); - ProjectDto project2 = db.components().insertPrivateProjectDto(p -> p.setKey("project:two").setName("Projet Deux")); - ProjectDto project3 = db.components().insertPrivateProjectDto(p -> p.setKey("project:three").setName("Project Three")); - ProjectDto project4 = db.components().insertPublicProjectDto(p -> p.setKey("project:four").setName("Project Four")); + ProjectDto project1 = db.components().insertPrivateProject(p -> p.setKey("project:one").setName("Projet Un")).getProjectDto(); + ProjectDto project2 = db.components().insertPrivateProject(p -> p.setKey("project:two").setName("Projet Deux")).getProjectDto(); + ProjectDto project3 = db.components().insertPrivateProject(p -> p.setKey("project:three").setName("Project Three")).getProjectDto(); + ProjectDto project4 = db.components().insertPublicProject(p -> p.setKey("project:four").setName("Project Four")).getProjectDto(); userSession.addProjectPermission(SCAN, project1, project2, project3, project4); List result = ws.newRequest() @@ -71,10 +71,10 @@ public class SearchMyScannableProjectsActionIT { @Test public void projects_not_filtered_by_empty_query() { - ProjectDto project1 = db.components().insertPrivateProjectDto(p -> p.setKey("project:one").setName("Projet Un")); - ProjectDto project2 = db.components().insertPrivateProjectDto(p -> p.setKey("project:two").setName("Projet Deux")); - ProjectDto project3 = db.components().insertPrivateProjectDto(p -> p.setKey("project:three").setName("Project Three")); - ProjectDto project4 = db.components().insertPublicProjectDto(p -> p.setKey("project:four").setName("Project Four")); + ProjectDto project1 = db.components().insertPrivateProject(p -> p.setKey("project:one").setName("Projet Un")).getProjectDto(); + ProjectDto project2 = db.components().insertPrivateProject(p -> p.setKey("project:two").setName("Projet Deux")).getProjectDto(); + ProjectDto project3 = db.components().insertPrivateProject(p -> p.setKey("project:three").setName("Project Three")).getProjectDto(); + ProjectDto project4 = db.components().insertPublicProject(p -> p.setKey("project:four").setName("Project Four")).getProjectDto(); userSession.addProjectPermission(SCAN, project1, project2, project3, project4); List result = ws.newRequest() @@ -93,10 +93,10 @@ public class SearchMyScannableProjectsActionIT { @Test public void projects_filtered_by_scan_permission() { - db.components().insertPrivateProjectDto(p -> p.setKey("project:one").setName("Projet Un")); - db.components().insertPrivateProjectDto(p -> p.setKey("project:two").setName("Projet Deux")); - db.components().insertPrivateProjectDto(p -> p.setKey("project:three").setName("Project Three")); - db.components().insertPublicProjectDto(p -> p.setKey("project:four").setName("Project Four")); + db.components().insertPrivateProject(p -> p.setKey("project:one").setName("Projet Un")).getProjectDto(); + db.components().insertPrivateProject(p -> p.setKey("project:two").setName("Projet Deux")).getProjectDto(); + db.components().insertPrivateProject(p -> p.setKey("project:three").setName("Project Three")).getProjectDto(); + db.components().insertPublicProject(p -> p.setKey("project:four").setName("Project Four")).getProjectDto(); List result = ws.newRequest() .executeProtobuf(SearchMyScannableProjectsResponse.class) @@ -107,10 +107,10 @@ public class SearchMyScannableProjectsActionIT { @Test public void projects_filtered_for_anonymous_user() { - ProjectDto project1 = db.components().insertPrivateProjectDto(p -> p.setKey("project:one").setName("Projet Un")); - ProjectDto project2 = db.components().insertPrivateProjectDto(p -> p.setKey("project:two").setName("Projet Deux")); - ProjectDto project3 = db.components().insertPrivateProjectDto(p -> p.setKey("project:three").setName("Project Three")); - ProjectDto project4 = db.components().insertPublicProjectDto(p -> p.setKey("project:four").setName("Project Four")); + ProjectDto project1 = db.components().insertPrivateProject(p -> p.setKey("project:one").setName("Projet Un")).getProjectDto(); + ProjectDto project2 = db.components().insertPrivateProject(p -> p.setKey("project:two").setName("Projet Deux")).getProjectDto(); + ProjectDto project3 = db.components().insertPrivateProject(p -> p.setKey("project:three").setName("Project Three")).getProjectDto(); + ProjectDto project4 = db.components().insertPublicProject(p -> p.setKey("project:four").setName("Project Four")).getProjectDto(); userSession.addProjectPermission(SCAN, project1, project2, project3, project4); WsActionTester ws = new WsActionTester( @@ -125,10 +125,10 @@ public class SearchMyScannableProjectsActionIT { @Test public void projects_not_filtered_due_to_global_scan_permission() { - db.components().insertPrivateProjectDto(p -> p.setKey("project:one").setName("Projet Un")); - db.components().insertPrivateProjectDto(p -> p.setKey("project:two").setName("Projet Deux")); - db.components().insertPrivateProjectDto(p -> p.setKey("project:three").setName("Project Three")); - db.components().insertPublicProjectDto(p -> p.setKey("project:four").setName("Project Four")); + db.components().insertPrivateProject(p -> p.setKey("project:one").setName("Projet Un")).getProjectDto(); + db.components().insertPrivateProject(p -> p.setKey("project:two").setName("Projet Deux")).getProjectDto(); + db.components().insertPrivateProject(p -> p.setKey("project:three").setName("Project Three")).getProjectDto(); + db.components().insertPublicProject(p -> p.setKey("project:four").setName("Project Four")).getProjectDto(); userSession.addPermission(GlobalPermission.SCAN); List result = ws.newRequest() @@ -146,10 +146,10 @@ public class SearchMyScannableProjectsActionIT { @Test public void json_example() { - ProjectDto project1 = db.components().insertPrivateProjectDto(p -> p.setKey("project-key-1").setName("Project 1")); - ProjectDto project2 = db.components().insertPrivateProjectDto(p -> p.setKey("project-key-2").setName("Project 2")); - ProjectDto project3 = db.components().insertPublicProjectDto(p -> p.setKey("public-project-without-scan-permissions") - .setName("Public Project with Scan Permissions")); + ProjectDto project1 = db.components().insertPrivateProject(p -> p.setKey("project-key-1").setName("Project 1")).getProjectDto(); + ProjectDto project2 = db.components().insertPrivateProject(p -> p.setKey("project-key-2").setName("Project 2")).getProjectDto(); + ProjectDto project3 = db.components().insertPublicProject(p -> p.setKey("public-project-without-scan-permissions") + .setName("Public Project with Scan Permissions")).getProjectDto(); userSession.addProjectPermission(SCAN, project1, project2); userSession.registerProjects(project3); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/project/ws/UpdateKeyActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/project/ws/UpdateKeyActionIT.java index 82d33bc640d..0a17167a8e0 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/project/ws/UpdateKeyActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/project/ws/UpdateKeyActionIT.java @@ -120,7 +120,7 @@ public class UpdateKeyActionIT { } private ComponentDto insertProject() { - return db.components().insertPrivateProject(); + return db.components().insertPrivateProject().getMainBranchComponent(); } private String call(@Nullable String key, @Nullable String newKey) { diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/project/ws/UpdateVisibilityActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/project/ws/UpdateVisibilityActionIT.java index e613a0fbf1c..0c2997f1706 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/project/ws/UpdateVisibilityActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/project/ws/UpdateVisibilityActionIT.java @@ -192,7 +192,7 @@ public class UpdateVisibilityActionIT { ComponentDto dir = ComponentTesting.newDirectory(project, "path"); ComponentDto file = ComponentTesting.newFileDto(project); dbTester.components().insertComponents(dir, file); - ComponentDto application = dbTester.components().insertPublicApplication(); + ComponentDto application = dbTester.components().insertPublicApplication().getMainBranchComponent(); ComponentDto portfolio = dbTester.components().insertPrivatePortfolio(); ComponentDto subView = ComponentTesting.newSubPortfolio(portfolio); ComponentDto projectCopy = newProjectCopy("foo", project, subView); @@ -220,7 +220,7 @@ public class UpdateVisibilityActionIT { @Test public void execute_throws_ForbiddenException_if_user_has_no_permission_on_specified_component() { - ComponentDto project = dbTester.components().insertPrivateProject(); + ComponentDto project = dbTester.components().insertPrivateProject().getMainBranchComponent(); request.setParam(PARAM_PROJECT, project.getKey()) .setParam(PARAM_VISIBILITY, randomVisibility); @@ -231,7 +231,7 @@ public class UpdateVisibilityActionIT { @Test public void execute_throws_ForbiddenException_if_user_has_all_permissions_but_ADMIN_on_specified_component() { - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); request.setParam(PARAM_PROJECT, project.getKey()) .setParam(PARAM_VISIBILITY, randomVisibility); userSessionRule.addProjectPermission(UserRole.ISSUE_ADMIN, project); @@ -246,7 +246,7 @@ public class UpdateVisibilityActionIT { @Test public void execute_throws_ForbiddenException_if_user_has_ADMIN_permission_but_sonar_allowPermissionManagementForProjectAdmins_is_set_to_false() { when(configuration.getBoolean(CORE_ALLOW_PERMISSION_MANAGEMENT_FOR_PROJECT_ADMINS_PROPERTY)).thenReturn(of(false)); - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); request.setParam(PARAM_PROJECT, project.getKey()) .setParam(PARAM_VISIBILITY, randomVisibility); userSessionRule.addProjectPermission(UserRole.ADMIN, project); @@ -259,7 +259,7 @@ public class UpdateVisibilityActionIT { @Test public void execute_throws_ForbiddenException_if_user_has_global_ADMIN_permission_even_if_sonar_allowPermissionManagementForProjectAdmins_is_set_to_false() { when(configuration.getBoolean(CORE_ALLOW_PERMISSION_MANAGEMENT_FOR_PROJECT_ADMINS_PROPERTY)).thenReturn(of(false)); - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); userSessionRule.setSystemAdministrator().addProjectPermission(UserRole.ADMIN, project); request.setParam(PARAM_PROJECT, project.getKey()) .setParam(PARAM_VISIBILITY, "private"); @@ -352,7 +352,7 @@ public class UpdateVisibilityActionIT { @Test public void execute_deletes_all_permissions_to_Anyone_on_specified_project_when_new_visibility_is_private() { - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); UserDto user = dbTester.users().insertUser(); GroupDto group = dbTester.users().insertGroup(); unsafeGiveAllPermissionsToRootComponent(project, user, group); @@ -367,7 +367,7 @@ public class UpdateVisibilityActionIT { @Test public void execute_does_not_delete_all_permissions_to_AnyOne_on_specified_project_if_already_private() { - ComponentDto project = dbTester.components().insertPrivateProject(); + ComponentDto project = dbTester.components().insertPrivateProject().getMainBranchComponent(); UserDto user = dbTester.users().insertUser(); GroupDto group = dbTester.users().insertGroup(); unsafeGiveAllPermissionsToRootComponent(project, user, group); @@ -382,7 +382,7 @@ public class UpdateVisibilityActionIT { @Test public void execute_deletes_all_permissions_USER_and_BROWSE_of_specified_project_when_new_visibility_is_public() { - ComponentDto project = dbTester.components().insertPrivateProject(); + ComponentDto project = dbTester.components().insertPrivateProject().getMainBranchComponent(); UserDto user = dbTester.users().insertUser(); GroupDto group = dbTester.users().insertGroup(); unsafeGiveAllPermissionsToRootComponent(project, user, group); @@ -397,7 +397,7 @@ public class UpdateVisibilityActionIT { @Test public void execute_does_not_delete_permissions_USER_and_BROWSE_of_specified_project_when_new_component_is_already_public() { - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); UserDto user = dbTester.users().insertUser(); GroupDto group = dbTester.users().insertGroup(); unsafeGiveAllPermissionsToRootComponent(project, user, group); @@ -438,7 +438,7 @@ public class UpdateVisibilityActionIT { @Test public void execute_grants_USER_and_CODEVIEWER_permissions_to_any_user_with_at_least_one_permission_when_making_project_private() { - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); UserDto user1 = dbTester.users().insertUser(); UserDto user2 = dbTester.users().insertUser(); UserDto user3 = dbTester.users().insertUser(); @@ -461,7 +461,7 @@ public class UpdateVisibilityActionIT { @Test public void execute_grants_USER_and_CODEVIEWER_permissions_to_any_group_with_at_least_one_permission_when_making_project_private() { - ComponentDto project = dbTester.components().insertPublicProject(); + ComponentDto project = dbTester.components().insertPublicProject().getMainBranchComponent(); GroupDto group1 = dbTester.users().insertGroup(); GroupDto group2 = dbTester.users().insertGroup(); GroupDto group3 = dbTester.users().insertGroup(); @@ -528,7 +528,7 @@ public class UpdateVisibilityActionIT { @Test public void update_an_application_to_private() { - ComponentDto application = dbTester.components().insertPublicApplication(); + ComponentDto application = dbTester.components().insertPublicApplication().getMainBranchComponent(); GroupDto group = dbTester.users().insertGroup(); dbTester.users().insertProjectPermissionOnGroup(group, UserRole.ISSUE_ADMIN, application); UserDto user = dbTester.users().insertUser(); @@ -548,7 +548,7 @@ public class UpdateVisibilityActionIT { @Test public void update_an_application_to_public() { - ComponentDto portfolio = dbTester.components().insertPrivateApplication(); + ComponentDto portfolio = dbTester.components().insertPrivateApplication().getMainBranchComponent(); userSessionRule.addProjectPermission(UserRole.ADMIN, portfolio); GroupDto group = dbTester.users().insertGroup(); dbTester.users().insertProjectPermissionOnGroup(group, UserRole.ISSUE_ADMIN, portfolio); @@ -690,6 +690,6 @@ public class UpdateVisibilityActionIT { } private ComponentDto randomPublicOrPrivateProject() { - return random.nextBoolean() ? dbTester.components().insertPublicProject() : dbTester.components().insertPrivateProject(); + return random.nextBoolean() ? dbTester.components().insertPublicProject().getMainBranchComponent() : dbTester.components().insertPrivateProject().getMainBranchComponent(); } } diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/projectanalysis/ws/CreateEventActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/projectanalysis/ws/CreateEventActionIT.java index 2a76d7c5883..1a89bacb97e 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/projectanalysis/ws/CreateEventActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/projectanalysis/ws/CreateEventActionIT.java @@ -79,7 +79,7 @@ public class CreateEventActionIT { @Test public void json_example() { - ProjectDto project = db.components().insertPrivateProjectDto(); + ProjectDto project = db.components().insertPrivateProject().getProjectDto(); SnapshotDto analysis = db.components().insertSnapshot(project, s -> s.setUuid("A2")); db.commit(); uuidFactory = mock(UuidFactory.class); @@ -98,7 +98,7 @@ public class CreateEventActionIT { @Test public void create_event_in_db() { - ProjectDto project = db.components().insertPrivateProjectDto(); + ProjectDto project = db.components().insertPrivateProject().getProjectDto(); SnapshotDto analysis = db.components().insertSnapshot(project); when(system.now()).thenReturn(123_456_789L); logInAsProjectAdministrator(project); @@ -120,7 +120,7 @@ public class CreateEventActionIT { @Test public void create_event_in_branch() { - ProjectDto project = db.components().insertPrivateProjectDto(); + ProjectDto project = db.components().insertPrivateProject().getProjectDto(); BranchDto branch = db.components().insertProjectBranch(project); SnapshotDto analysis = db.components().insertSnapshot(branch); @@ -144,7 +144,7 @@ public class CreateEventActionIT { @Test public void create_event_as_project_admin() { - ProjectDto project = db.components().insertPrivateProjectDto(); + ProjectDto project = db.components().insertPrivateProject().getProjectDto(); SnapshotDto analysis = db.components().insertSnapshot(project); logInAsProjectAdministrator(project); @@ -155,7 +155,7 @@ public class CreateEventActionIT { @Test public void create_version_event() { - ProjectDto project = db.components().insertPrivateProjectDto(); + ProjectDto project = db.components().insertPrivateProject().getProjectDto(); SnapshotDto analysis = db.components().insertSnapshot(project); logInAsProjectAdministrator(project); @@ -167,7 +167,7 @@ public class CreateEventActionIT { @Test public void create_other_event_with_ws_response() { - ProjectDto project = db.components().insertPrivateProjectDto(); + ProjectDto project = db.components().insertPrivateProject().getProjectDto(); SnapshotDto analysis = db.components().insertSnapshot(project); logInAsProjectAdministrator(project); @@ -185,7 +185,7 @@ public class CreateEventActionIT { @Test public void create_event_without_description() { - ProjectDto project = db.components().insertPrivateProjectDto(); + ProjectDto project = db.components().insertPrivateProject().getProjectDto(); SnapshotDto analysis = db.components().insertSnapshot(project); logInAsProjectAdministrator(project); @@ -198,7 +198,7 @@ public class CreateEventActionIT { @Test public void create_event_on_application() { - ProjectDto application = db.components().insertPrivateApplicationDto(); + ProjectDto application = db.components().insertPrivateApplication().getProjectDto(); SnapshotDto analysis = db.components().insertSnapshot(application); logInAsProjectAdministrator(application); @@ -210,7 +210,7 @@ public class CreateEventActionIT { @Test public void create_2_version_events_on_same_project() { - ProjectDto project = db.components().insertPrivateProjectDto(); + ProjectDto project = db.components().insertPrivateProject().getProjectDto(); SnapshotDto firstAnalysis = db.components().insertSnapshot(project); SnapshotDto secondAnalysis = db.components().insertSnapshot(project); db.commit(); @@ -225,7 +225,7 @@ public class CreateEventActionIT { @Test public void fail_if_not_blank_name() { - ProjectDto project = db.components().insertPrivateProjectDto(); + ProjectDto project = db.components().insertPrivateProject().getProjectDto(); SnapshotDto analysis = db.components().insertSnapshot(project); logInAsProjectAdministrator(project); @@ -245,7 +245,7 @@ public class CreateEventActionIT { @Test public void fail_if_2_version_events_on_the_same_analysis() { - ProjectDto project = db.components().insertPrivateProjectDto(); + ProjectDto project = db.components().insertPrivateProject().getProjectDto(); SnapshotDto analysis = db.components().insertSnapshot(project); logInAsProjectAdministrator(project); call(VERSION.name(), "5.6.3", analysis.getUuid()); @@ -257,7 +257,7 @@ public class CreateEventActionIT { @Test public void fail_if_2_other_events_on_same_analysis_with_same_name() { - ProjectDto project = db.components().insertPrivateProjectDto(); + ProjectDto project = db.components().insertPrivateProject().getProjectDto(); SnapshotDto analysis = db.components().insertSnapshot(project); logInAsProjectAdministrator(project); call(OTHER.name(), "Project Import", analysis.getUuid()); @@ -269,7 +269,7 @@ public class CreateEventActionIT { @Test public void fail_if_category_other_than_authorized() { - ProjectDto project = db.components().insertPrivateProjectDto(); + ProjectDto project = db.components().insertPrivateProject().getProjectDto(); SnapshotDto analysis = db.components().insertSnapshot(project); logInAsProjectAdministrator(project); @@ -283,7 +283,7 @@ public class CreateEventActionIT { @Test public void fail_if_create_version_event_on_application() { - ProjectDto application = db.components().insertPrivateApplicationDto(); + ProjectDto application = db.components().insertPrivateApplication().getProjectDto(); SnapshotDto analysis = db.components().insertSnapshot(application); logInAsProjectAdministrator(application); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/projectanalysis/ws/DeleteActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/projectanalysis/ws/DeleteActionIT.java index 4b4c1ecc469..d747bb04732 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/projectanalysis/ws/DeleteActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/projectanalysis/ws/DeleteActionIT.java @@ -57,7 +57,7 @@ public class DeleteActionIT { @Test public void project_administrator_deletes_analysis() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); db.components().insertSnapshot(newAnalysis(project).setUuid("A1").setLast(false).setStatus(STATUS_PROCESSED)); db.components().insertSnapshot(newAnalysis(project).setUuid("A2").setLast(true).setStatus(STATUS_PROCESSED)); logInAsProjectAdministrator(project); @@ -81,7 +81,7 @@ public class DeleteActionIT { @Test public void last_analysis_cannot_be_deleted() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); db.components().insertSnapshot(newAnalysis(project).setUuid("A1").setLast(true)); logInAsProjectAdministrator(project); @@ -93,7 +93,7 @@ public class DeleteActionIT { @Test public void fail_when_analysis_is_new_code_period_baseline() { String analysisUuid = RandomStringUtils.randomAlphabetic(12); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); SnapshotDto analysis = db.components().insertSnapshot(newAnalysis(project).setUuid(analysisUuid).setLast(false)); db.newCodePeriods().insert(new NewCodePeriodDto() .setProjectUuid(project.uuid()) @@ -119,7 +119,7 @@ public class DeleteActionIT { @Test public void fail_when_analysis_is_unprocessed() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); db.components().insertSnapshot(newAnalysis(project).setUuid("A1").setLast(false).setStatus(STATUS_UNPROCESSED)); logInAsProjectAdministrator(project); @@ -130,7 +130,7 @@ public class DeleteActionIT { @Test public void fail_when_not_enough_permission() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); db.components().insertSnapshot(newAnalysis(project).setUuid("A1").setLast(false)); userSession.logIn(); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/projectanalysis/ws/DeleteEventActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/projectanalysis/ws/DeleteEventActionIT.java index 02caddcda7b..d29a25e84c2 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/projectanalysis/ws/DeleteEventActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/projectanalysis/ws/DeleteEventActionIT.java @@ -73,7 +73,7 @@ public class DeleteEventActionIT { @Test public void delete_version_event() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); SnapshotDto analysis = db.components().insertSnapshot(newAnalysis(project).setProjectVersion("5.6.3").setLast(false)); db.events().insertEvent(newEvent(analysis).setUuid("E1").setCategory(VERSION.getLabel())); logInAsProjectAdministrator(project); @@ -86,7 +86,7 @@ public class DeleteEventActionIT { @Test public void fail_if_version_for_last_analysis() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); SnapshotDto analysis = db.components().insertSnapshot(newAnalysis(project).setProjectVersion("5.6.3").setLast(true)); db.events().insertEvent(newEvent(analysis).setUuid("E1").setCategory(VERSION.getLabel())); logInAsProjectAdministrator(project); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/projectanalysis/ws/SearchActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/projectanalysis/ws/SearchActionIT.java index c852453117b..a21b270da00 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/projectanalysis/ws/SearchActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/projectanalysis/ws/SearchActionIT.java @@ -72,7 +72,6 @@ import static org.sonar.api.utils.DateUtils.formatDate; import static org.sonar.api.utils.DateUtils.formatDateTime; import static org.sonar.api.utils.DateUtils.parseDateTime; import static org.sonar.db.component.ComponentDbTester.toProjectDto; -import static org.sonar.db.component.ComponentTesting.newBranchDto; import static org.sonar.db.component.ComponentTesting.newFileDto; import static org.sonar.db.component.ComponentTesting.newMainBranchDto; import static org.sonar.db.component.SnapshotTesting.newAnalysis; @@ -145,7 +144,7 @@ public class SearchActionIT { .setKey(CorePropertyDefinitions.SONAR_ANALYSIS_DETECTEDCI) .setValue("Jenkins") .setCreatedAt(1L)); - BranchDto branchDto = newMainBranchDto(project); + BranchDto branchDto = newMainBranchDto(project, project.uuid()); db.getDbClient().branchDao().insert(db.getSession(), branchDto); db.newCodePeriods().insert(new NewCodePeriodDto() .setProjectUuid(project.uuid()) @@ -185,7 +184,7 @@ public class SearchActionIT { @Test public void return_analyses_ordered_by_analysis_date() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(UserRole.USER, project); db.components().insertSnapshot(newAnalysis(project).setUuid("A1").setCreatedAt(1_000_000L)); db.components().insertSnapshot(newAnalysis(project).setUuid("A2").setCreatedAt(2_000_000L)); @@ -202,7 +201,7 @@ public class SearchActionIT { @Test public void return_only_processed_analyses() { - ComponentDto project = db.components().insertPrivateProject(c -> c.setKey("P1")); + ComponentDto project = db.components().insertPrivateProject(c -> c.setKey("P1")).getMainBranchComponent(); userSession.addProjectPermission(UserRole.USER, project); db.components().insertSnapshot(newAnalysis(project).setUuid("A1")); db.components().insertSnapshot(newAnalysis(project).setUuid("A2").setStatus(SnapshotDto.STATUS_UNPROCESSED)); @@ -215,7 +214,7 @@ public class SearchActionIT { @Test public void return_events() { - ComponentDto project = db.components().insertPrivateProject(c -> c.setKey("P1")); + ComponentDto project = db.components().insertPrivateProject(c -> c.setKey("P1")).getMainBranchComponent(); userSession.addProjectPermission(UserRole.USER, project); SnapshotDto a1 = db.components().insertSnapshot(newAnalysis(project).setUuid("A1")); SnapshotDto a42 = db.components().insertSnapshot(newAnalysis(ComponentTesting.newPrivateProjectDto()).setUuid("A42")); @@ -235,7 +234,7 @@ public class SearchActionIT { @Test public void return_analyses_of_application() { - ComponentDto application = db.components().insertPublicApplication(); + ComponentDto application = db.components().insertPublicApplication().getMainBranchComponent(); userSession.registerApplication(toProjectDto(application, 1L)); SnapshotDto firstAnalysis = db.components().insertSnapshot(newAnalysis(application).setCreatedAt(1_000_000L)); SnapshotDto secondAnalysis = db.components().insertSnapshot(newAnalysis(application).setCreatedAt(2_000_000L)); @@ -254,7 +253,7 @@ public class SearchActionIT { @Test public void return_definition_change_events_on_application_analyses() { - ComponentDto application = db.components().insertPublicApplication(); + ComponentDto application = db.components().insertPublicApplication().getMainBranchComponent(); userSession.registerApplication(toProjectDto(application, 1L)); SnapshotDto firstAnalysis = db.components().insertSnapshot(newAnalysis(application).setCreatedAt(1_000_000L)); EventDto event = db.events().insertEvent(newEvent(firstAnalysis).setName("").setUuid("E11").setCategory(DEFINITION_CHANGE.getLabel())); @@ -279,7 +278,7 @@ public class SearchActionIT { @Test @UseDataProvider("changedBranches") public void application_definition_change_with_branch(@Nullable String oldBranch, @Nullable String newBranch) { - ComponentDto application = db.components().insertPublicApplication(); + ComponentDto application = db.components().insertPublicApplication().getMainBranchComponent(); userSession.registerApplication(toProjectDto(application, 1L)); SnapshotDto firstAnalysis = db.components().insertSnapshot(newAnalysis(application).setCreatedAt(1_000_000L)); EventDto event = db.events().insertEvent(newEvent(firstAnalysis).setName("").setUuid("E11").setCategory(DEFINITION_CHANGE.getLabel())); @@ -301,7 +300,7 @@ public class SearchActionIT { @Test public void incorrect_eventcomponentchange_two_identical_changes_added_on_same_project() { - ComponentDto application = db.components().insertPublicApplication(); + ComponentDto application = db.components().insertPublicApplication().getMainBranchComponent(); userSession.registerApplication(toProjectDto(application, 1L)); SnapshotDto firstAnalysis = db.components().insertSnapshot(newAnalysis(application).setCreatedAt(1_000_000L)); EventDto event = db.events().insertEvent(newEvent(firstAnalysis).setName("").setUuid("E11").setCategory(DEFINITION_CHANGE.getLabel())); @@ -330,7 +329,7 @@ public class SearchActionIT { @Test public void incorrect_eventcomponentchange_incorrect_category() { - ComponentDto application = db.components().insertPublicApplication(); + ComponentDto application = db.components().insertPublicApplication().getMainBranchComponent(); userSession.registerApplication(toProjectDto(application, 1L)); SnapshotDto firstAnalysis = db.components().insertSnapshot(newAnalysis(application).setCreatedAt(1_000_000L)); EventDto event = db.events().insertEvent(newEvent(firstAnalysis).setName("").setUuid("E11").setCategory(DEFINITION_CHANGE.getLabel())); @@ -356,7 +355,7 @@ public class SearchActionIT { @Test public void incorrect_eventcomponentchange_three_component_changes_on_same_project() { - ComponentDto application = db.components().insertPublicApplication(); + ComponentDto application = db.components().insertPublicApplication().getMainBranchComponent(); userSession.registerApplication(toProjectDto(application, 1L)); SnapshotDto firstAnalysis = db.components().insertSnapshot(newAnalysis(application).setCreatedAt(1_000_000L)); EventDto event = db.events().insertEvent(newEvent(firstAnalysis).setName("").setUuid("E11").setCategory(DEFINITION_CHANGE.getLabel())); @@ -387,7 +386,7 @@ public class SearchActionIT { @Test public void incorrect_quality_gate_information() { - ComponentDto application = db.components().insertPublicApplication(); + ComponentDto application = db.components().insertPublicApplication().getMainBranchComponent(); userSession.registerApplication(toProjectDto(application, 1L)); SnapshotDto firstAnalysis = db.components().insertSnapshot(newAnalysis(application).setCreatedAt(1_000_000L)); EventDto event = db.events().insertEvent( @@ -435,7 +434,7 @@ public class SearchActionIT { @Test public void paginate_analyses() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(UserRole.USER, project); IntStream.rangeClosed(1, 9).forEach(i -> db.components().insertSnapshot(newAnalysis(project).setCreatedAt(1_000_000L * i).setUuid("A" + i))); @@ -451,7 +450,7 @@ public class SearchActionIT { @Test public void filter_by_category() { - ComponentDto project = db.components().insertPrivateProject(c -> c.setKey("P1")); + ComponentDto project = db.components().insertPrivateProject(c -> c.setKey("P1")).getMainBranchComponent(); userSession.addProjectPermission(UserRole.USER, project); SnapshotDto a1 = db.components().insertSnapshot(newAnalysis(project).setUuid("A1")); SnapshotDto a2 = db.components().insertSnapshot(newAnalysis(project).setUuid("A2")); @@ -472,7 +471,7 @@ public class SearchActionIT { @Test public void paginate_with_filter_on_category() { - ComponentDto project = db.components().insertPrivateProject(c -> c.setKey("P1")); + ComponentDto project = db.components().insertPrivateProject(c -> c.setKey("P1")).getMainBranchComponent(); userSession.addProjectPermission(UserRole.USER, project); SnapshotDto a1 = db.components().insertSnapshot(newAnalysis(project).setUuid("A1").setCreatedAt(1_000_000L)); SnapshotDto a2 = db.components().insertSnapshot(newAnalysis(project).setUuid("A2").setCreatedAt(2_000_000L)); @@ -499,7 +498,7 @@ public class SearchActionIT { @Test public void filter_from_date() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(UserRole.USER, project); SnapshotDto a1 = db.components().insertSnapshot(newAnalysis(project).setUuid("a1").setCreatedAt(1_000_000_000L)); SnapshotDto a2 = db.components().insertSnapshot(newAnalysis(project).setUuid("a2").setCreatedAt(2_000_000_000L)); @@ -519,7 +518,7 @@ public class SearchActionIT { @Test public void filter_to_date() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(UserRole.USER, project); SnapshotDto a1 = db.components().insertSnapshot(newAnalysis(project).setUuid("a1").setCreatedAt(1_000_000_000L)); SnapshotDto a2 = db.components().insertSnapshot(newAnalysis(project).setUuid("a2").setCreatedAt(2_000_000_000L)); @@ -539,7 +538,7 @@ public class SearchActionIT { @Test public void filter_by_dates_using_datetime_format() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(UserRole.USER, project); SnapshotDto a1 = db.components().insertSnapshot(newAnalysis(project).setUuid("a1").setCreatedAt(1_000_000_000L)); SnapshotDto a2 = db.components().insertSnapshot(newAnalysis(project).setUuid("a2").setCreatedAt(2_000_000_000L)); @@ -560,7 +559,7 @@ public class SearchActionIT { @Test public void filter_by_dates_using_date_format() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(UserRole.USER, project); SnapshotDto a1 = db.components().insertSnapshot(newAnalysis(project).setUuid("a1").setCreatedAt(1_000_000_000L)); SnapshotDto a2 = db.components().insertSnapshot(newAnalysis(project).setUuid("a2").setCreatedAt(2_000_000_000L)); @@ -581,7 +580,7 @@ public class SearchActionIT { @Test public void branch() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(UserRole.USER, project); ComponentDto branch = db.components().insertProjectBranch(project, b -> b.setKey("my_branch")); userSession.addProjectBranchMapping(project.uuid(), branch); @@ -600,7 +599,7 @@ public class SearchActionIT { @Test public void empty_response() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(UserRole.USER, project); SearchResponse result = call(project.getKey()); @@ -612,7 +611,7 @@ public class SearchActionIT { @Test public void populates_projectVersion_and_buildString() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(UserRole.USER, project); SnapshotDto[] analyses = new SnapshotDto[] { db.components().insertSnapshot(newAnalysis(project).setProjectVersion(null).setBuildString(null)), @@ -635,7 +634,7 @@ public class SearchActionIT { @Test public void fail_if_not_enough_permissions() { userSession.anonymous(); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); var projectDbKey = project.getKey(); assertThatThrownBy(() -> call(projectDbKey)) @@ -644,9 +643,9 @@ public class SearchActionIT { @Test public void fail_if_not_enough_permissions_on_applications_projects() { - ComponentDto application = db.components().insertPrivateApplication(); - ComponentDto project1 = db.components().insertPrivateProject(); - ComponentDto project2 = db.components().insertPrivateProject(); + ComponentDto application = db.components().insertPrivateApplication().getMainBranchComponent(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); userSession.logIn() .registerApplication( @@ -668,7 +667,7 @@ public class SearchActionIT { @Test public void fail_if_not_a_project_portfolio_or_application() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); db.components().insertSnapshot(newAnalysis(project)); userSession.registerComponents(project, file); @@ -681,7 +680,7 @@ public class SearchActionIT { @Test public void fail_if_branch_does_not_exist() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(UserRole.USER, project); db.components().insertProjectBranch(project, b -> b.setKey("my_branch")); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/projectanalysis/ws/UpdateEventActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/projectanalysis/ws/UpdateEventActionIT.java index e894dff5f63..33e94ac67b5 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/projectanalysis/ws/UpdateEventActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/projectanalysis/ws/UpdateEventActionIT.java @@ -65,7 +65,7 @@ public class UpdateEventActionIT { @Test public void json_example() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); SnapshotDto analysis = db.components().insertSnapshot(newAnalysis(project).setUuid("A2")); db.events().insertEvent(newEvent(analysis) .setUuid("E1") @@ -249,7 +249,7 @@ public class UpdateEventActionIT { } private SnapshotDto createAnalysisAndLogInAsProjectAdministrator(String version) { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); SnapshotDto analysis = db.components().insertSnapshot(newAnalysis(project).setProjectVersion(version)); logInAsProjectAdministrator(project); return analysis; diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/projectdump/ws/ExportActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/projectdump/ws/ExportActionIT.java index 87ddddc2562..87c7b0ea792 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/projectdump/ws/ExportActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/projectdump/ws/ExportActionIT.java @@ -65,7 +65,7 @@ public class ExportActionIT { @Before public void setUp() { - project = db.components().insertPrivateProject(PROJECT_ID, p -> p.setKey(PROJECT_KEY).setName(PROJECT_NAME)); + project = db.components().insertPrivateProject(PROJECT_ID, p -> p.setKey(PROJECT_KEY).setName(PROJECT_NAME)).getMainBranchComponent(); } @Test diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/projectdump/ws/StatusActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/projectdump/ws/StatusActionIT.java index 9d51123f3a9..27e43f5c6c8 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/projectdump/ws/StatusActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/projectdump/ws/StatusActionIT.java @@ -279,7 +279,7 @@ public class StatusActionIT { @Test public void fail_when_using_branch_id() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); ComponentDto branch = db.components().insertProjectBranch(project); assertThatThrownBy(() -> { @@ -291,7 +291,7 @@ public class StatusActionIT { } private ProjectDto insertProject(String uuid, String key) { - return db.components().insertPrivateProjectDto(c -> c.setBranchUuid(uuid).setUuid(uuid).setKey(key)); + return db.components().insertPrivateProject(c -> c.setBranchUuid(uuid).setUuid(uuid).setKey(key)).getProjectDto(); } private void insertSnapshot(ProjectDto projectDto, boolean last) { diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/projectlink/ws/CreateActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/projectlink/ws/CreateActionIT.java index 38528bbabb4..77481837ca7 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/projectlink/ws/CreateActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/projectlink/ws/CreateActionIT.java @@ -62,7 +62,7 @@ public class CreateActionIT { @Test public void example_with_key() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); logInAsProjectAdministrator(project); String result = ws.newRequest() @@ -77,7 +77,7 @@ public class CreateActionIT { @Test public void example_with_id() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); logInAsProjectAdministrator(project); String result = ws.newRequest() @@ -92,7 +92,7 @@ public class CreateActionIT { @Test public void require_project_admin() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); logInAsProjectAdministrator(project); createAndTest(project); @@ -100,7 +100,7 @@ public class CreateActionIT { @Test public void with_long_name() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); logInAsProjectAdministrator(project); String longName = StringUtils.leftPad("", 60, "a"); String expectedType = StringUtils.leftPad("", 20, "a"); @@ -159,7 +159,7 @@ public class CreateActionIT { @Test public void fail_if_anonymous() { userSession.anonymous(); - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); userSession.registerComponents(project); assertThatThrownBy(() -> ws.newRequest() @@ -173,7 +173,7 @@ public class CreateActionIT { @Test public void fail_if_not_project_admin() { userSession.logIn(); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); assertThatThrownBy(() -> ws.newRequest() .setParam(PARAM_PROJECT_KEY, project.getKey()) @@ -185,7 +185,7 @@ public class CreateActionIT { @Test public void fail_if_directory() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto directory = db.components().insertComponent(ComponentTesting.newDirectory(project, "A/B")); failIfNotAProjectWithKey(project, directory); failIfNotAProjectWithUuid(project, directory); @@ -193,7 +193,7 @@ public class CreateActionIT { @Test public void fail_if_file() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(ComponentTesting.newFileDto(project)); failIfNotAProjectWithKey(project, file); failIfNotAProjectWithUuid(project, file); @@ -209,7 +209,7 @@ public class CreateActionIT { @Test public void fail_when_using_branch_db_uuid() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.logIn().addProjectPermission(UserRole.USER, project); ComponentDto branch = db.components().insertProjectBranch(project); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/projectlink/ws/DeleteActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/projectlink/ws/DeleteActionIT.java index f6fd1121c55..3c1fbfb4091 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/projectlink/ws/DeleteActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/projectlink/ws/DeleteActionIT.java @@ -54,7 +54,7 @@ public class DeleteActionIT { @Test public void no_response() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ProjectLinkDto link = db.componentLinks().insertCustomLink(project); logInAsProjectAdministrator(project); @@ -66,7 +66,7 @@ public class DeleteActionIT { @Test public void remove_custom_link() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ProjectLinkDto link = db.componentLinks().insertCustomLink(project); logInAsProjectAdministrator(project); @@ -77,8 +77,8 @@ public class DeleteActionIT { @Test public void keep_links_of_another_project() { - ComponentDto project1 = db.components().insertPrivateProject(); - ComponentDto project2 = db.components().insertPrivateProject(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); ProjectLinkDto customLink1 = db.componentLinks().insertCustomLink(project1); ProjectLinkDto customLink2 = db.componentLinks().insertCustomLink(project2); userSession.logIn().addProjectPermission(ADMIN, project1, project2); @@ -91,7 +91,7 @@ public class DeleteActionIT { @Test public void fail_when_delete_provided_link() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ProjectLinkDto link = db.componentLinks().insertProvidedLink(project); logInAsProjectAdministrator(project); @@ -111,7 +111,7 @@ public class DeleteActionIT { @Test public void fail_if_anonymous() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ProjectLinkDto link = db.componentLinks().insertCustomLink(project); userSession.anonymous(); @@ -121,7 +121,7 @@ public class DeleteActionIT { @Test public void fail_if_not_project_admin() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ProjectLinkDto link = db.componentLinks().insertCustomLink(project); userSession.logIn(); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/projectlink/ws/SearchActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/projectlink/ws/SearchActionIT.java index 9ff93389f16..73a10a7f898 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/projectlink/ws/SearchActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/projectlink/ws/SearchActionIT.java @@ -59,7 +59,7 @@ public class SearchActionIT { @Test public void example() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); db.componentLinks().insertProvidedLink(project, l -> l.setUuid("1").setType("homepage").setName("Homepage").setHref("http://example.org")); db.componentLinks().insertCustomLink(project, l -> l.setUuid("2").setType("custom").setName("Custom").setHref("http://example.org/custom")); logInAsProjectAdministrator(project); @@ -73,7 +73,7 @@ public class SearchActionIT { @Test public void request_by_project_id() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ProjectLinkDto link = db.componentLinks().insertCustomLink(project); logInAsProjectAdministrator(project); @@ -86,7 +86,7 @@ public class SearchActionIT { @Test public void request_by_project_key() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ProjectLinkDto link = db.componentLinks().insertCustomLink(project); logInAsProjectAdministrator(project); @@ -99,7 +99,7 @@ public class SearchActionIT { @Test public void response_fields() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ProjectLinkDto homepageLink = db.componentLinks().insertProvidedLink(project); ProjectLinkDto customLink = db.componentLinks().insertCustomLink(project); logInAsProjectAdministrator(project); @@ -114,8 +114,8 @@ public class SearchActionIT { @Test public void several_projects() { - ComponentDto project1 = db.components().insertPrivateProject(); - ComponentDto project2 = db.components().insertPrivateProject(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); ProjectLinkDto link1 = db.componentLinks().insertCustomLink(project1); ProjectLinkDto link2 = db.componentLinks().insertCustomLink(project2); userSession.addProjectPermission(USER, project1); @@ -130,7 +130,7 @@ public class SearchActionIT { @Test public void request_does_not_fail_when_link_has_no_name() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ProjectLinkDto link = db.componentLinks().insertProvidedLink(project); logInAsProjectAdministrator(project); @@ -143,7 +143,7 @@ public class SearchActionIT { @Test public void project_administrator_can_search_for_links() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ProjectLinkDto link = db.componentLinks().insertCustomLink(project); logInAsProjectAdministrator(project); @@ -156,7 +156,7 @@ public class SearchActionIT { @Test public void project_user_can_search_for_links() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ProjectLinkDto link = db.componentLinks().insertCustomLink(project); userSession.logIn().addProjectPermission(USER, project); @@ -175,7 +175,7 @@ public class SearchActionIT { @Test public void fail_if_directory() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto directory = db.components().insertComponent(ComponentTesting.newDirectory(project, "A/B")); failIfNotAProjectWithKey(project, directory); failIfNotAProjectWithUuid(project, directory); @@ -183,7 +183,7 @@ public class SearchActionIT { @Test public void fail_if_file() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(ComponentTesting.newFileDto(project)); failIfNotAProjectWithKey(project, file); failIfNotAProjectWithUuid(project, file); @@ -199,7 +199,7 @@ public class SearchActionIT { @Test public void fail_if_insufficient_privileges() { userSession.anonymous(); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); assertThatThrownBy(() -> callByKey(project.getKey())) .isInstanceOf(ForbiddenException.class); @@ -207,7 +207,7 @@ public class SearchActionIT { @Test public void fail_when_both_id_and_key_are_provided() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); logInAsProjectAdministrator(project); assertThatThrownBy(() -> ws.newRequest() @@ -219,7 +219,7 @@ public class SearchActionIT { @Test public void fail_when_no_id_nor_key_are_provided() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); assertThatThrownBy(() -> ws.newRequest() .setParam(PARAM_PROJECT_KEY, project.getKey()) @@ -230,7 +230,7 @@ public class SearchActionIT { @Test public void fail_when_using_branch_db_uuid() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.logIn().addProjectPermission(USER, project); ComponentDto branch = db.components().insertProjectBranch(project); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/projecttag/ws/SetActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/projecttag/ws/SetActionIT.java index 12ad1491a8d..206f3544801 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/projecttag/ws/SetActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/projecttag/ws/SetActionIT.java @@ -67,7 +67,7 @@ public class SetActionIT { @Before public void setUp() { - project = db.components().insertPrivateProjectDto(); + project = db.components().insertPrivateProject().getProjectDto(); userSession.addProjectPermission(ADMIN, project); } @@ -83,8 +83,8 @@ public class SetActionIT { @Test public void reset_tags() { - project = db.components().insertPrivateProjectDto(c -> { - }, p -> p.setTagsString("platform,scanner")); + project = db.components().insertPrivateProject(c -> { + }, p -> p.setTagsString("platform,scanner")).getProjectDto(); userSession.addProjectPermission(ADMIN, project); call(project.getKey(), ""); @@ -94,8 +94,8 @@ public class SetActionIT { @Test public void override_existing_tags() { - project = db.components().insertPrivateProjectDto(c -> { - }, p -> p.setTagsString("marketing,languages")); + project = db.components().insertPrivateProject(c -> { + }, p -> p.setTagsString("marketing,languages")).getProjectDto(); userSession.addProjectPermission(ADMIN, project); call(project.getKey(), "finance,offshore,platform"); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/qualitygate/ws/DeselectActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/qualitygate/ws/DeselectActionIT.java index 36d59916b6f..433b7eecc66 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/qualitygate/ws/DeselectActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/qualitygate/ws/DeselectActionIT.java @@ -60,7 +60,7 @@ public class DeselectActionIT { public void deselect_by_key() { userSession.addPermission(ADMINISTER_QUALITY_GATES); QualityGateDto qualityGate = db.qualityGates().insertQualityGate(); - ProjectDto project = db.components().insertPrivateProjectDto(); + ProjectDto project = db.components().insertPrivateProject().getProjectDto(); associateProjectToQualityGate(project, qualityGate); ws.newRequest() @@ -73,7 +73,7 @@ public class DeselectActionIT { @Test public void project_admin() { QualityGateDto qualityGate = db.qualityGates().insertQualityGate(); - ProjectDto project = db.components().insertPrivateProjectDto(); + ProjectDto project = db.components().insertPrivateProject().getProjectDto(); associateProjectToQualityGate(project, qualityGate); userSession.logIn().addProjectPermission(UserRole.ADMIN, project); @@ -88,10 +88,10 @@ public class DeselectActionIT { public void other_project_should_not_be_updated() { userSession.addPermission(ADMINISTER_QUALITY_GATES); QualityGateDto qualityGate = db.qualityGates().insertQualityGate(); - ProjectDto project = db.components().insertPrivateProjectDto(); + ProjectDto project = db.components().insertPrivateProject().getProjectDto(); associateProjectToQualityGate(project, qualityGate); // Another project - ProjectDto anotherProject = db.components().insertPrivateProjectDto(); + ProjectDto anotherProject = db.components().insertPrivateProject().getProjectDto(); associateProjectToQualityGate(anotherProject, qualityGate); ws.newRequest() @@ -106,7 +106,7 @@ public class DeselectActionIT { public void default_is_used() { userSession.addPermission(ADMINISTER_QUALITY_GATES); QualityGateDto qualityGate = db.qualityGates().insertQualityGate(); - ProjectDto project = db.components().insertPrivateProjectDto(); + ProjectDto project = db.components().insertPrivateProject().getProjectDto(); associateProjectToQualityGate(project, qualityGate); ws.newRequest() @@ -128,7 +128,7 @@ public class DeselectActionIT { @Test public void fail_when_anonymous() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.anonymous(); assertThatThrownBy(() -> ws.newRequest() @@ -139,7 +139,7 @@ public class DeselectActionIT { @Test public void fail_when_not_project_admin() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.logIn().addProjectPermission(UserRole.ISSUE_ADMIN, project); assertThatThrownBy(() -> ws.newRequest() @@ -151,7 +151,7 @@ public class DeselectActionIT { @Test public void fail_when_not_quality_gates_admin() { userSession.addPermission(ADMINISTER_QUALITY_GATES); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.logIn().addPermission(ADMINISTER_QUALITY_PROFILES); assertThatThrownBy(() -> ws.newRequest() diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/qualitygate/ws/DestroyActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/qualitygate/ws/DestroyActionIT.java index 37f438d7d27..213ed67a087 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/qualitygate/ws/DestroyActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/qualitygate/ws/DestroyActionIT.java @@ -94,8 +94,8 @@ public class DestroyActionIT { public void delete_quality_gate_and_any_association_to_any_project() { db.qualityGates().createDefaultQualityGate(); QualityGateDto qualityGate = db.qualityGates().insertQualityGate(); - ProjectDto prj1 = db.components().insertPublicProjectDto(); - ProjectDto prj2 = db.components().insertPublicProjectDto(); + ProjectDto prj1 = db.components().insertPublicProject().getProjectDto(); + ProjectDto prj2 = db.components().insertPublicProject().getProjectDto(); db.qualityGates().associateProjectToQualityGate(prj1, qualityGate); db.qualityGates().associateProjectToQualityGate(prj2, qualityGate); userSession.addPermission(ADMINISTER_QUALITY_GATES); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/qualitygate/ws/GetByProjectActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/qualitygate/ws/GetByProjectActionIT.java index ed2702f76b6..97821202624 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/qualitygate/ws/GetByProjectActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/qualitygate/ws/GetByProjectActionIT.java @@ -69,7 +69,7 @@ public class GetByProjectActionIT { @Test public void json_example() { - ProjectDto project = db.components().insertPrivateProjectDto(); + ProjectDto project = db.components().insertPrivateProject().getProjectDto(); QualityGateDto qualityGate = db.qualityGates().insertQualityGate(qg -> qg.setName("My team QG")); db.qualityGates().associateProjectToQualityGate(project, qualityGate); logInAsProjectUser(project); @@ -86,7 +86,7 @@ public class GetByProjectActionIT { @Test public void default_quality_gate() { - ProjectDto project = db.components().insertPrivateProjectDto(); + ProjectDto project = db.components().insertPrivateProject().getProjectDto(); QualityGateDto dbQualityGate = db.qualityGates().insertQualityGate(); db.qualityGates().setDefaultQualityGate(dbQualityGate); logInAsProjectUser(project); @@ -102,7 +102,7 @@ public class GetByProjectActionIT { @Test public void project_quality_gate_over_default() { - ProjectDto project = db.components().insertPrivateProjectDto(); + ProjectDto project = db.components().insertPrivateProject().getProjectDto(); QualityGateDto defaultDbQualityGate = db.qualityGates().insertQualityGate(); db.qualityGates().setDefaultQualityGate(defaultDbQualityGate); QualityGateDto qualityGate = db.qualityGates().insertQualityGate(); @@ -120,7 +120,7 @@ public class GetByProjectActionIT { @Test public void get_by_project_key() { - ProjectDto project = db.components().insertPrivateProjectDto(); + ProjectDto project = db.components().insertPrivateProject().getProjectDto(); QualityGateDto qualityGate = db.qualityGates().insertQualityGate(qg -> qg.setName("My team QG")); db.qualityGates().associateProjectToQualityGate(project, qualityGate); @@ -135,7 +135,7 @@ public class GetByProjectActionIT { @Test public void get_with_project_admin_permission() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); QualityGateDto qualityGate = db.qualityGates().insertQualityGate(); db.qualityGates().setDefaultQualityGate(qualityGate); userSession.logIn().addProjectPermission(UserRole.ADMIN, project); @@ -149,7 +149,7 @@ public class GetByProjectActionIT { @Test public void get_with_project_user_permission() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); QualityGateDto qualityGate = db.qualityGates().insertQualityGate(); db.qualityGates().setDefaultQualityGate(qualityGate); userSession.logIn().addProjectPermission(UserRole.USER, project); @@ -165,7 +165,7 @@ public class GetByProjectActionIT { public void fail_when_insufficient_permission() { QualityGateDto dbQualityGate = db.qualityGates().insertQualityGate(); db.qualityGates().setDefaultQualityGate(dbQualityGate); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.logIn(); assertThatThrownBy(() -> ws.newRequest() diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/qualitygate/ws/ProjectStatusActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/qualitygate/ws/ProjectStatusActionIT.java index aea18c85ee4..af475156e7b 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/qualitygate/ws/ProjectStatusActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/qualitygate/ws/ProjectStatusActionIT.java @@ -105,7 +105,7 @@ public class ProjectStatusActionIT { @Test public void test_json_example() throws IOException { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(UserRole.USER, project); MetricDto gateDetailsMetric = insertGateDetailMetric(); @@ -127,7 +127,7 @@ public class ProjectStatusActionIT { @Test public void return_past_status_when_project_is_referenced_by_past_analysis_id() throws IOException { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); SnapshotDto pastAnalysis = dbClient.snapshotDao().insert(dbSession, newAnalysis(project) .setLast(false) .setPeriodMode("last_version") @@ -157,7 +157,7 @@ public class ProjectStatusActionIT { @Test public void return_live_status_when_project_is_referenced_by_its_id() throws IOException { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); dbClient.snapshotDao().insert(dbSession, newAnalysis(project) .setPeriodMode("last_version") .setPeriodParam("2015-12-07") @@ -178,7 +178,7 @@ public class ProjectStatusActionIT { @Test public void return_past_status_when_branch_is_referenced_by_past_analysis_id() throws IOException { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto branch = db.components().insertProjectBranch(project); SnapshotDto pastAnalysis = dbClient.snapshotDao().insert(dbSession, newAnalysis(branch) .setLast(false) @@ -209,7 +209,7 @@ public class ProjectStatusActionIT { @Test public void return_live_status_when_project_is_referenced_by_its_key() throws IOException { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); dbClient.snapshotDao().insert(dbSession, newAnalysis(project) .setPeriodMode("last_version") .setPeriodParam("2015-12-07") @@ -230,7 +230,7 @@ public class ProjectStatusActionIT { @Test public void return_live_status_when_branch_is_referenced_by_its_key() throws IOException { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); String branchName = randomAlphanumeric(248); ComponentDto branch = db.components().insertProjectBranch(project, b -> b.setKey(branchName)); @@ -255,7 +255,7 @@ public class ProjectStatusActionIT { @Test public void return_live_status_when_pull_request_is_referenced_by_its_key() throws IOException { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); String pullRequestKey = RandomStringUtils.randomAlphanumeric(100); ComponentDto pr = db.components().insertProjectBranch(project, branch -> branch.setBranchType(BranchType.PULL_REQUEST) .setKey(pullRequestKey)); @@ -281,7 +281,7 @@ public class ProjectStatusActionIT { @Test public void return_undefined_status_if_specified_analysis_is_not_found() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); SnapshotDto snapshot = dbClient.snapshotDao().insert(dbSession, newAnalysis(project)); dbSession.commit(); userSession.addProjectPermission(UserRole.USER, project); @@ -296,7 +296,7 @@ public class ProjectStatusActionIT { @Test public void return_undefined_status_if_project_is_not_analyzed() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(UserRole.USER, project); ProjectStatusResponse result = ws.newRequest() @@ -309,7 +309,7 @@ public class ProjectStatusActionIT { @Test public void project_administrator_is_allowed_to_get_project_status() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); SnapshotDto snapshot = dbClient.snapshotDao().insert(dbSession, newAnalysis(project)); dbSession.commit(); userSession.addProjectPermission(UserRole.ADMIN, project); @@ -321,7 +321,7 @@ public class ProjectStatusActionIT { @Test public void project_user_is_allowed_to_get_project_status() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); SnapshotDto snapshot = dbClient.snapshotDao().insert(dbSession, newAnalysis(project)); dbSession.commit(); userSession.addProjectPermission(UserRole.USER, project); @@ -333,7 +333,7 @@ public class ProjectStatusActionIT { @Test public void check_cayc_compliant_flag() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); var qg = db.qualityGates().insertBuiltInQualityGate(); db.qualityGates().setDefaultQualityGate(qg); when(qualityGateCaycChecker.checkCaycCompliantFromProject(any(DbSession.class), eq(project.uuid()))).thenReturn(COMPLIANT); @@ -350,7 +350,7 @@ public class ProjectStatusActionIT { @Test public void user_with_project_scan_permission_is_allowed_to_get_project_status() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); SnapshotDto snapshot = dbClient.snapshotDao().insert(dbSession, newAnalysis(project)); dbSession.commit(); userSession.addProjectPermission(UserRole.SCAN, project); @@ -363,7 +363,7 @@ public class ProjectStatusActionIT { @Test public void user_with_global_scan_permission_is_allowed_to_get_project_status() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); SnapshotDto snapshot = dbClient.snapshotDao().insert(dbSession, newAnalysis(project)); dbSession.commit(); userSession.addPermission(GlobalPermission.SCAN); @@ -387,7 +387,7 @@ public class ProjectStatusActionIT { @Test public void fail_if_insufficient_privileges() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); SnapshotDto snapshot = dbClient.snapshotDao().insert(dbSession, newAnalysis(project)); dbSession.commit(); userSession.logIn(); @@ -400,7 +400,7 @@ public class ProjectStatusActionIT { @Test public void fail_if_project_id_and_ce_task_id_provided() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); logInAsSystemAdministrator(); assertThatThrownBy(() -> ws.newRequest() @@ -413,7 +413,7 @@ public class ProjectStatusActionIT { @Test public void fail_if_branch_key_and_pull_request_id_provided() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); logInAsSystemAdministrator(); assertThatThrownBy(() -> ws.newRequest() @@ -437,7 +437,7 @@ public class ProjectStatusActionIT { @Test public void fail_when_using_branch_uuid() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); userSession.logIn().addProjectPermission(UserRole.ADMIN, project); ComponentDto branch = db.components().insertProjectBranch(project); SnapshotDto snapshot = db.components().insertSnapshot(branch); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/qualitygate/ws/SearchActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/qualitygate/ws/SearchActionIT.java index 5a4a329ed83..8746c33cf0f 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/qualitygate/ws/SearchActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/qualitygate/ws/SearchActionIT.java @@ -65,9 +65,9 @@ public class SearchActionIT { @Test public void search_projects_of_a_quality_gate() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); QualityGateDto qualityGate = db.qualityGates().insertQualityGate(); - db.qualityGates().associateProjectToQualityGate(db.components().getProjectDto(project), qualityGate); + db.qualityGates().associateProjectToQualityGate(db.components().getProjectDtoByMainBranch(project), qualityGate); SearchResponse response = ws.newRequest() .setParam(PARAM_GATE_NAME, valueOf(qualityGate.getName())) @@ -92,8 +92,8 @@ public class SearchActionIT { @Test public void return_all_projects() { QualityGateDto qualityGate = db.qualityGates().insertQualityGate(); - ProjectDto unassociatedProject = db.components().insertPublicProjectDto(); - ProjectDto associatedProject = db.components().insertPublicProjectDto(); + ProjectDto unassociatedProject = db.components().insertPublicProject().getProjectDto(); + ProjectDto associatedProject = db.components().insertPublicProject().getProjectDto(); db.qualityGates().associateProjectToQualityGate(associatedProject, qualityGate); SearchResponse response = ws.newRequest() @@ -111,8 +111,8 @@ public class SearchActionIT { @Test public void return_only_associated_project() { QualityGateDto qualityGate = db.qualityGates().insertQualityGate(); - ProjectDto associatedProject = db.components().insertPublicProjectDto(); - ProjectDto unassociatedProject = db.components().insertPublicProjectDto(); + ProjectDto associatedProject = db.components().insertPublicProject().getProjectDto(); + ProjectDto unassociatedProject = db.components().insertPublicProject().getProjectDto(); db.qualityGates().associateProjectToQualityGate(associatedProject, qualityGate); SearchResponse response = ws.newRequest() @@ -129,8 +129,8 @@ public class SearchActionIT { @Test public void return_only_unassociated_project() { QualityGateDto qualityGate = db.qualityGates().insertQualityGate(); - ProjectDto associatedProject = db.components().insertPublicProjectDto(); - ProjectDto unassociatedProject = db.components().insertPublicProjectDto(); + ProjectDto associatedProject = db.components().insertPublicProject().getProjectDto(); + ProjectDto unassociatedProject = db.components().insertPublicProject().getProjectDto(); db.qualityGates().associateProjectToQualityGate(associatedProject, qualityGate); SearchResponse response = ws.newRequest() @@ -147,8 +147,8 @@ public class SearchActionIT { @Test public void return_only_authorized_projects() { QualityGateDto qualityGate = db.qualityGates().insertQualityGate(); - ComponentDto project1 = db.components().insertPrivateProject(); - ComponentDto project2 = db.components().insertPrivateProject(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); UserDto user = db.users().insertUser(); // User can only see project1 1 db.users().insertProjectPermissionOnUser(user, USER, project1); @@ -168,9 +168,9 @@ public class SearchActionIT { @Test public void test_paging() { QualityGateDto qualityGate = db.qualityGates().insertQualityGate(); - ProjectDto project1 = db.components().insertPublicProjectDto(); - ProjectDto project2 = db.components().insertPublicProjectDto(); - ProjectDto project3 = db.components().insertPublicProjectDto(); + ProjectDto project1 = db.components().insertPublicProject().getProjectDto(); + ProjectDto project2 = db.components().insertPublicProject().getProjectDto(); + ProjectDto project3 = db.components().insertPublicProject().getProjectDto(); db.qualityGates().associateProjectToQualityGate(project1, qualityGate); // Return partial result on first page @@ -233,7 +233,7 @@ public class SearchActionIT { public void test_pagination_on_many_pages() { QualityGateDto qualityGate = db.qualityGates().insertQualityGate(); for (int i = 0; i < 20; i++) { - ProjectDto project = db.components().insertPublicProjectDto(); + ProjectDto project = db.components().insertPublicProject().getProjectDto(); db.qualityGates().associateProjectToQualityGate(project, qualityGate); } userSession.addPermission(ADMINISTER_QUALITY_GATES); @@ -256,7 +256,7 @@ public class SearchActionIT { public void test_pagination_on_one_page() { QualityGateDto qualityGate = db.qualityGates().insertQualityGate(); for (int i = 0; i < 20; i++) { - ProjectDto project = db.components().insertPublicProjectDto(); + ProjectDto project = db.components().insertPublicProject().getProjectDto(); db.qualityGates().associateProjectToQualityGate(project, qualityGate); } userSession.addPermission(ADMINISTER_QUALITY_GATES); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/qualitygate/ws/SelectActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/qualitygate/ws/SelectActionIT.java index 653586dbb15..276b866050e 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/qualitygate/ws/SelectActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/qualitygate/ws/SelectActionIT.java @@ -58,7 +58,7 @@ public class SelectActionIT { public void select_by_key() { userSession.addPermission(ADMINISTER_QUALITY_GATES); QualityGateDto qualityGate = db.qualityGates().insertQualityGate(); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ws.newRequest() .setParam(PARAM_GATE_NAME, qualityGate.getName()) @@ -73,7 +73,7 @@ public class SelectActionIT { userSession.addPermission(ADMINISTER_QUALITY_GATES); QualityGateDto initialQualityGate = db.qualityGates().insertQualityGate(); QualityGateDto secondQualityGate = db.qualityGates().insertQualityGate(); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ws.newRequest() .setParam(PARAM_GATE_NAME, initialQualityGate.getName()) @@ -92,7 +92,7 @@ public class SelectActionIT { public void select_same_quality_gate_for_project_twice() { userSession.addPermission(ADMINISTER_QUALITY_GATES); QualityGateDto initialQualityGate = db.qualityGates().insertQualityGate(); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ws.newRequest() .setParam(PARAM_GATE_NAME, initialQualityGate.getName()) @@ -110,7 +110,7 @@ public class SelectActionIT { @Test public void project_admin() { QualityGateDto qualityGate = db.qualityGates().insertQualityGate(); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.logIn().addProjectPermission(ADMIN, project); ws.newRequest() @@ -125,7 +125,7 @@ public class SelectActionIT { public void gate_administrator_can_associate_a_gate_to_a_project() { userSession.addPermission(ADMINISTER_QUALITY_GATES); QualityGateDto qualityGate = db.qualityGates().insertQualityGate(); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ws.newRequest() .setParam(PARAM_GATE_NAME, qualityGate.getName()) @@ -138,7 +138,7 @@ public class SelectActionIT { @Test public void fail_when_no_quality_gate() { userSession.addPermission(ADMINISTER_QUALITY_GATES); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); assertThatThrownBy(() -> ws.newRequest() .setParam(PARAM_GATE_NAME, "unknown") @@ -162,7 +162,7 @@ public class SelectActionIT { @Test public void fail_when_anonymous() { QualityGateDto qualityGate = db.qualityGates().insertQualityGate(); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.anonymous(); assertThatThrownBy(() -> ws.newRequest() @@ -175,7 +175,7 @@ public class SelectActionIT { @Test public void fail_when_not_project_admin() { QualityGateDto qualityGate = db.qualityGates().insertQualityGate(); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.logIn().addProjectPermission(ISSUE_ADMIN, project); assertThatThrownBy(() -> ws.newRequest() @@ -188,7 +188,7 @@ public class SelectActionIT { @Test public void fail_when_not_quality_gates_admin() { QualityGateDto qualityGate = db.qualityGates().insertQualityGate(); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.logIn(); assertThatThrownBy(() -> ws.newRequest() diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/qualityprofile/QProfileFactoryImplIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/qualityprofile/QProfileFactoryImplIT.java index f806ffc5387..1af67ebf60b 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/qualityprofile/QProfileFactoryImplIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/qualityprofile/QProfileFactoryImplIT.java @@ -144,7 +144,7 @@ public class QProfileFactoryImplIT { @Test public void delete_removes_custom_profile_from_project_associations() { QProfileDto profile = createCustomProfile(); - ProjectDto project = db.components().insertPrivateProjectDto(); + ProjectDto project = db.components().insertPrivateProject().getProjectDto(); db.qualityProfiles().associateWithProject(project, profile); underTest.delete(dbSession, asList(profile)); @@ -170,7 +170,7 @@ public class QProfileFactoryImplIT { @Test public void delete_builtin_profile_associated_to_project() { RulesProfileDto builtInProfile = createBuiltInProfile(); - ProjectDto project = db.components().insertPrivateProjectDto(); + ProjectDto project = db.components().insertPrivateProject().getProjectDto(); QProfileDto profile = associateBuiltInProfile(builtInProfile); db.qualityProfiles().associateWithProject(project, profile); assertThat(db.getDbClient().qualityProfileDao().selectAssociatedToProjectAndLanguage(dbSession, project, profile.getLanguage())).isNotNull(); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/qualityprofile/ws/AddProjectActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/qualityprofile/ws/AddProjectActionIT.java index c77611f88e2..4edf4521f9a 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/qualityprofile/ws/AddProjectActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/qualityprofile/ws/AddProjectActionIT.java @@ -86,7 +86,7 @@ public class AddProjectActionIT { @Test public void add_project_on_profile() { logInAsProfileAdmin(); - ProjectDto project = db.components().insertPrivateProjectDto(); + ProjectDto project = db.components().insertPrivateProject().getProjectDto(); QProfileDto profile = db.qualityProfiles().insert(qp -> qp.setLanguage("xoo")); TestResponse response = call(project, profile); @@ -101,7 +101,7 @@ public class AddProjectActionIT { UserDto user = db.users().insertUser(); QProfileDto qualityProfile = db.qualityProfiles().insert(qp -> qp.setLanguage(LANGUAGE_1)); db.qualityProfiles().addUserPermission(qualityProfile, user); - ProjectDto project = db.components().insertPrivateProjectDto(); + ProjectDto project = db.components().insertPrivateProject().getProjectDto(); userSession.logIn(user).addPermission(GlobalPermission.ADMINISTER_QUALITY_PROFILES); call(project, qualityProfile); @@ -114,7 +114,7 @@ public class AddProjectActionIT { public void change_association() { logInAsProfileAdmin(); - ProjectDto project = db.components().insertPrivateProjectDto(); + ProjectDto project = db.components().insertPrivateProject().getProjectDto(); // two profiles on same language QProfileDto profile1 = db.qualityProfiles().insert(p -> p.setLanguage(LANGUAGE_1)); QProfileDto profile2 = db.qualityProfiles().insert(p -> p.setLanguage(LANGUAGE_1)); @@ -130,7 +130,7 @@ public class AddProjectActionIT { @Test public void changing_association_does_not_change_other_language_associations() { logInAsProfileAdmin(); - ProjectDto project = db.components().insertPrivateProjectDto(); + ProjectDto project = db.components().insertPrivateProject().getProjectDto(); QProfileDto profile1Language1 = db.qualityProfiles().insert(p -> p.setLanguage(LANGUAGE_1)); QProfileDto profile2Language2 = db.qualityProfiles().insert(p -> p.setLanguage(LANGUAGE_2)); QProfileDto profile3Language1 = db.qualityProfiles().insert(p -> p.setLanguage(LANGUAGE_1)); @@ -145,7 +145,7 @@ public class AddProjectActionIT { @Test public void project_administrator_can_change_profile() { - ProjectDto project = db.components().insertPrivateProjectDto(); + ProjectDto project = db.components().insertPrivateProject().getProjectDto(); QProfileDto profile = db.qualityProfiles().insert(qp -> qp.setLanguage("xoo")); userSession.logIn(db.users().insertUser()).addProjectPermission(UserRole.ADMIN, project); @@ -158,7 +158,7 @@ public class AddProjectActionIT { @Test public void throw_ForbiddenException_if_not_project_nor_global_administrator() { userSession.logIn(db.users().insertUser()); - ProjectDto project = db.components().insertPrivateProjectDto(); + ProjectDto project = db.components().insertPrivateProject().getProjectDto(); QProfileDto profile = db.qualityProfiles().insert(qp -> qp.setLanguage("xoo")); assertThatThrownBy(() -> call(project, profile)) @@ -169,7 +169,7 @@ public class AddProjectActionIT { @Test public void throw_UnauthorizedException_if_not_logged_in() { userSession.anonymous(); - ProjectDto project = db.components().insertPrivateProjectDto(); + ProjectDto project = db.components().insertPrivateProject().getProjectDto(); QProfileDto profile = db.qualityProfiles().insert(); assertThatThrownBy(() -> call(project, profile)) @@ -195,7 +195,7 @@ public class AddProjectActionIT { @Test public void throw_NotFoundException_if_profile_does_not_exist() { logInAsProfileAdmin(); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); assertThatThrownBy(() -> { tester.newRequest() diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/qualityprofile/ws/DeleteActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/qualityprofile/ws/DeleteActionIT.java index e364574f4c0..352ff1bc8f0 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/qualityprofile/ws/DeleteActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/qualityprofile/ws/DeleteActionIT.java @@ -74,7 +74,7 @@ public class DeleteActionIT { @Test public void delete_profile_by_language_and_name() { - ProjectDto project = db.components().insertPrivateProjectDto(); + ProjectDto project = db.components().insertPrivateProject().getProjectDto(); QProfileDto profile1 = createProfile(); QProfileDto profile2 = createProfile(); db.qualityProfiles().associateWithProject(project, profile1); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/qualityprofile/ws/ProjectsActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/qualityprofile/ws/ProjectsActionIT.java index a4c23830881..4f077cee168 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/qualityprofile/ws/ProjectsActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/qualityprofile/ws/ProjectsActionIT.java @@ -53,10 +53,10 @@ public class ProjectsActionIT { @Test public void list_authorized_projects_only() { - ComponentDto project1 = db.components().insertPrivateProject(); - ComponentDto project2 = db.components().insertPrivateProject(); + ComponentDto project1 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project2 = db.components().insertPrivateProject().getMainBranchComponent(); QProfileDto qualityProfile = db.qualityProfiles().insert(); - associateProjectsWithProfile(qualityProfile, db.components().getProjectDto(project1), db.components().getProjectDto(project2)); + associateProjectsWithProfile(qualityProfile, db.components().getProjectDtoByMainBranch(project1), db.components().getProjectDtoByMainBranch(project2)); // user only sees project1 UserDto user = db.users().insertUser(); db.users().insertProjectPermissionOnUser(user, USER, project1); @@ -78,10 +78,10 @@ public class ProjectsActionIT { @Test public void paginate() { - ProjectDto project1 = db.components().insertPublicProjectDto(p -> p.setName("Project One")); - ProjectDto project2 = db.components().insertPublicProjectDto(p -> p.setName("Project Two")); - ProjectDto project3 = db.components().insertPublicProjectDto(p -> p.setName("Project Three")); - ProjectDto project4 = db.components().insertPublicProjectDto(p -> p.setName("Project Four")); + ProjectDto project1 = db.components().insertPublicProject(p -> p.setName("Project One")).getProjectDto(); + ProjectDto project2 = db.components().insertPublicProject(p -> p.setName("Project Two")).getProjectDto(); + ProjectDto project3 = db.components().insertPublicProject(p -> p.setName("Project Three")).getProjectDto(); + ProjectDto project4 = db.components().insertPublicProject(p -> p.setName("Project Four")).getProjectDto(); QProfileDto qualityProfile = db.qualityProfiles().insert(); associateProjectsWithProfile(qualityProfile, project1, project2, project3, project4); @@ -186,8 +186,8 @@ public class ProjectsActionIT { @Test public void show_unselected() { - ProjectDto project1 = db.components().insertPublicProjectDto(); - ProjectDto project2 = db.components().insertPublicProjectDto(); + ProjectDto project1 = db.components().insertPublicProject().getProjectDto(); + ProjectDto project2 = db.components().insertPublicProject().getProjectDto(); QProfileDto qualityProfile = db.qualityProfiles().insert(); associateProjectsWithProfile(qualityProfile, project1); @@ -206,10 +206,10 @@ public class ProjectsActionIT { @Test public void show_all() { - ProjectDto project1 = db.components().insertPublicProjectDto(); - ProjectDto project2 = db.components().insertPublicProjectDto(); - ProjectDto project3 = db.components().insertPublicProjectDto(); - ProjectDto project4 = db.components().insertPublicProjectDto(); + ProjectDto project1 = db.components().insertPublicProject().getProjectDto(); + ProjectDto project2 = db.components().insertPublicProject().getProjectDto(); + ProjectDto project3 = db.components().insertPublicProject().getProjectDto(); + ProjectDto project4 = db.components().insertPublicProject().getProjectDto(); QProfileDto qualityProfile1 = db.qualityProfiles().insert(); associateProjectsWithProfile(qualityProfile1, project1, project2); QProfileDto qualityProfile2 = db.qualityProfiles().insert(); @@ -243,11 +243,11 @@ public class ProjectsActionIT { @Test public void filter_on_name_and_key() { - ProjectDto project1 = db.components().insertPublicProjectDto(p -> p.setName("Project One")); - ProjectDto project2 = db.components().insertPublicProjectDto(p -> p.setName("Project Two")); - ProjectDto project3 = db.components().insertPublicProjectDto(p -> p.setName("Project Three")); - db.components().insertPublicProjectDto(p -> p.setName("Project Four")); - ProjectDto project5 = db.components().insertPublicProjectDto(p -> p.setKey("Project the fifth")); + ProjectDto project1 = db.components().insertPublicProject(p -> p.setName("Project One")).getProjectDto(); + ProjectDto project2 = db.components().insertPublicProject(p -> p.setName("Project Two")).getProjectDto(); + ProjectDto project3 = db.components().insertPublicProject(p -> p.setName("Project Three")).getProjectDto(); + db.components().insertPublicProject(p -> p.setName("Project Four")).getProjectDto(); + ProjectDto project5 = db.components().insertPublicProject(p -> p.setKey("Project the fifth")).getProjectDto(); QProfileDto qualityProfile = db.qualityProfiles().insert(); associateProjectsWithProfile(qualityProfile, project1, project2); @@ -280,7 +280,7 @@ public class ProjectsActionIT { @Test public void return_deprecated_uuid_field() { - ProjectDto project = db.components().insertPublicProjectDto(); + ProjectDto project = db.components().insertPublicProject().getProjectDto(); QProfileDto qualityProfile = db.qualityProfiles().insert(); associateProjectsWithProfile(qualityProfile, project); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/qualityprofile/ws/RemoveProjectActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/qualityprofile/ws/RemoveProjectActionIT.java index bdf07017ef5..38ac097dd0d 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/qualityprofile/ws/RemoveProjectActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/qualityprofile/ws/RemoveProjectActionIT.java @@ -91,7 +91,7 @@ public class RemoveProjectActionIT { public void remove_profile_from_project() { logInAsProfileAdmin(); - ProjectDto project = db.components().insertPrivateProjectDto(); + ProjectDto project = db.components().insertPrivateProject().getProjectDto(); QProfileDto profileLang1 = db.qualityProfiles().insert(p -> p.setLanguage(LANGUAGE_1)); QProfileDto profileLang2 = db.qualityProfiles().insert(p -> p.setLanguage(LANGUAGE_2)); db.qualityProfiles().associateWithProject(project, profileLang1); @@ -109,7 +109,7 @@ public class RemoveProjectActionIT { public void removal_does_not_fail_if_profile_is_not_associated_to_project() { logInAsProfileAdmin(); - ProjectDto project = db.components().insertPrivateProjectDto(); + ProjectDto project = db.components().insertPrivateProject().getProjectDto(); QProfileDto profile = db.qualityProfiles().insert(qp -> qp.setLanguage("xoo")); TestResponse response = call(project, profile); @@ -121,7 +121,7 @@ public class RemoveProjectActionIT { @Test public void project_administrator_can_remove_profile() { - ProjectDto project = db.components().insertPrivateProjectDto(); + ProjectDto project = db.components().insertPrivateProject().getProjectDto(); QProfileDto profile = db.qualityProfiles().insert(qp -> qp.setLanguage("xoo")); db.qualityProfiles().associateWithProject(project, profile); userSession.logIn(db.users().insertUser()).addProjectPermission(UserRole.ADMIN, project); @@ -134,7 +134,7 @@ public class RemoveProjectActionIT { @Test public void as_qprofile_editor_and_global_admin() { - ProjectDto project = db.components().insertPrivateProjectDto(); + ProjectDto project = db.components().insertPrivateProject().getProjectDto(); QProfileDto profile = db.qualityProfiles().insert(p -> p.setLanguage(LANGUAGE_1)); db.qualityProfiles().associateWithProject(project, profile); UserDto user = db.users().insertUser(); @@ -149,7 +149,7 @@ public class RemoveProjectActionIT { @Test public void as_qprofile_editor_fail_if_not_project_nor_global_admin() { - ProjectDto project = db.components().insertPrivateProjectDto(); + ProjectDto project = db.components().insertPrivateProject().getProjectDto(); QProfileDto profile = db.qualityProfiles().insert(p -> p.setLanguage(LANGUAGE_1)); db.qualityProfiles().associateWithProject(project, profile); UserDto user = db.users().insertUser(); @@ -164,7 +164,7 @@ public class RemoveProjectActionIT { @Test public void fail_if_not_enough_permissions() { userSession.logIn(db.users().insertUser()); - ProjectDto project = db.components().insertPrivateProjectDto(); + ProjectDto project = db.components().insertPrivateProject().getProjectDto(); QProfileDto profile = db.qualityProfiles().insert(qp -> qp.setLanguage("xoo")); assertThatThrownBy(() -> call(project, profile)) @@ -175,7 +175,7 @@ public class RemoveProjectActionIT { @Test public void fail_if_not_logged_in() { userSession.anonymous(); - ProjectDto project = db.components().insertPrivateProjectDto(); + ProjectDto project = db.components().insertPrivateProject().getProjectDto(); QProfileDto profile = db.qualityProfiles().insert(); assertThatThrownBy(() -> call(project, profile)) @@ -201,7 +201,7 @@ public class RemoveProjectActionIT { @Test public void fail_if_profile_does_not_exist() { logInAsProfileAdmin(); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); assertThatThrownBy(() -> { ws.newRequest() diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/qualityprofile/ws/SearchActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/qualityprofile/ws/SearchActionIT.java index 58c1621b355..bb1fa77deb0 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/qualityprofile/ws/SearchActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/qualityprofile/ws/SearchActionIT.java @@ -179,7 +179,7 @@ public class SearchActionIT { @Test public void filter_on_project_key() { - ProjectDto project = db.components().insertPrivateProjectDto(); + ProjectDto project = db.components().insertPrivateProject().getProjectDto(); QProfileDto profileOnXoo1 = db.qualityProfiles().insert(q -> q.setLanguage(XOO1.getKey())); QProfileDto defaultProfileOnXoo1 = db.qualityProfiles().insert(q -> q.setLanguage(XOO1.getKey())); QProfileDto defaultProfileOnXoo2 = db.qualityProfiles().insert(q -> q.setLanguage(XOO2.getKey())); @@ -196,7 +196,7 @@ public class SearchActionIT { @Test public void filter_on_project_key_and_default() { - ProjectDto project = db.components().insertPrivateProjectDto(); + ProjectDto project = db.components().insertPrivateProject().getProjectDto(); QProfileDto profileOnXoo1 = db.qualityProfiles().insert(q -> q.setLanguage(XOO1.getKey())); QProfileDto defaultProfileOnXoo1 = db.qualityProfiles().insert(q -> q.setLanguage(XOO1.getKey())); QProfileDto defaultProfileOnXoo2 = db.qualityProfiles().insert(q -> q.setLanguage(XOO2.getKey())); @@ -217,7 +217,7 @@ public class SearchActionIT { public void empty_when_filtering_on_project_and_no_language_installed() { WsActionTester ws = new WsActionTester(new SearchAction(userSession, new Languages(), dbClient, new ComponentFinder(dbClient, null))); db.qualityProfiles().insert(); - ProjectDto project = db.components().insertPrivateProjectDto(); + ProjectDto project = db.components().insertPrivateProject().getProjectDto(); QProfileDto profileOnXoo1 = db.qualityProfiles().insert(q -> q.setLanguage(XOO1.getKey())); db.qualityProfiles().associateWithProject(project, profileOnXoo1); @@ -308,8 +308,8 @@ public class SearchActionIT { @Test public void statistics_on_projects() { - ProjectDto project1 = db.components().insertPrivateProjectDto(); - ProjectDto project2 = db.components().insertPrivateProjectDto(); + ProjectDto project1 = db.components().insertPrivateProject().getProjectDto(); + ProjectDto project2 = db.components().insertPrivateProject().getProjectDto(); QProfileDto profileOnXoo1 = db.qualityProfiles().insert(q -> q.setLanguage(XOO1.getKey())); QProfileDto defaultProfileOnXoo1 = db.qualityProfiles().insert(q -> q.setLanguage(XOO1.getKey())); db.qualityProfiles().associateWithProject(project1, profileOnXoo1); @@ -382,7 +382,7 @@ public class SearchActionIT { .forEach(rule -> db.qualityProfiles().activateRule(sonarWayCs, rule)); // project range(0, 7) - .mapToObj(i -> db.components().insertPrivateProjectDto()) + .mapToObj(i -> db.components().insertPrivateProject().getProjectDto()) .forEach(project -> db.qualityProfiles().associateWithProject(project, myBuProfile)); // User UserDto user = db.users().insertUser(); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/qualityprofile/ws/ShowActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/qualityprofile/ws/ShowActionIT.java index fdff7f6bbd5..c7fc1eb58de 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/qualityprofile/ws/ShowActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/qualityprofile/ws/ShowActionIT.java @@ -135,7 +135,7 @@ public class ShowActionIT { .forEach(r -> db.qualityProfiles().activateRule(profile, r)); // Projects range(0, 7) - .mapToObj(i -> db.components().insertPrivateProjectDto()) + .mapToObj(i -> db.components().insertPrivateProject().getProjectDto()) .forEach(project -> db.qualityProfiles().associateWithProject(project, profile)); ShowResponse result = call(ws.newRequest().setParam(PARAM_KEY, profile.getKee())); @@ -327,7 +327,7 @@ public class ShowActionIT { .forEach(r -> db.qualityProfiles().activateRule(profile, r)); // Projects range(0, 7) - .mapToObj(i -> db.components().insertPrivateProjectDto()) + .mapToObj(i -> db.components().insertPrivateProject().getProjectDto()) .forEach(project -> db.qualityProfiles().associateWithProject(project, profile)); ws = new WsActionTester( diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/scannercache/ws/ClearActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/scannercache/ws/ClearActionIT.java index 1c2fb9430f4..db7e55a404f 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/scannercache/ws/ClearActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/scannercache/ws/ClearActionIT.java @@ -62,8 +62,8 @@ public class ClearActionIT { @Test public void should_clear_all_entries() throws IOException { - ProjectDto project1 = dbTester.components().insertPrivateProjectDto(); - ProjectDto project2 = dbTester.components().insertPrivateProjectDto(); + ProjectDto project1 = dbTester.components().insertPrivateProject().getProjectDto(); + ProjectDto project2 = dbTester.components().insertPrivateProject().getProjectDto(); dao.insert(dbTester.getSession(), project1.getUuid(), stringToInputStream("test data")); dao.insert(dbTester.getSession(), project2.getUuid(), stringToInputStream("test data")); @@ -78,10 +78,10 @@ public class ClearActionIT { @Test public void should_clear_project_cache() { - ProjectDto project1 = dbTester.components().insertPrivateProjectDto(cDto -> cDto.setKey("p1")); + ProjectDto project1 = dbTester.components().insertPrivateProject(cDto -> cDto.setKey("p1")).getProjectDto(); BranchDto branch11 = dbTester.components().insertProjectBranch(project1, cdto -> cdto.setKey("b11")); BranchDto branch12 = dbTester.components().insertProjectBranch(project1, cdto -> cdto.setKey("b12")); - ProjectDto project2 = dbTester.components().insertPrivateProjectDto(cDto -> cDto.setKey("p2")); + ProjectDto project2 = dbTester.components().insertPrivateProject(cDto -> cDto.setKey("p2")).getProjectDto(); BranchDto branch21 = dbTester.components().insertProjectBranch(project2, cdto -> cdto.setKey("b21")); dao.insert(dbTester.getSession(), branch11.getUuid(), stringToInputStream("test data")); @@ -101,10 +101,10 @@ public class ClearActionIT { @Test public void should_clear_branch_cache() { - ProjectDto project1 = dbTester.components().insertPrivateProjectDto(cDto -> cDto.setKey("p1")); + ProjectDto project1 = dbTester.components().insertPrivateProject(cDto -> cDto.setKey("p1")).getProjectDto(); BranchDto branch11 = dbTester.components().insertProjectBranch(project1, cdto -> cdto.setKey("b11")); BranchDto branch12 = dbTester.components().insertProjectBranch(project1, cdto -> cdto.setKey("b12")); - ProjectDto project2 = dbTester.components().insertPrivateProjectDto(cDto -> cDto.setKey("p2")); + ProjectDto project2 = dbTester.components().insertPrivateProject(cDto -> cDto.setKey("p2")).getProjectDto(); BranchDto branch21 = dbTester.components().insertProjectBranch(project2, cdto -> cdto.setKey("b21")); dao.insert(dbTester.getSession(), branch11.getUuid(), stringToInputStream("test data")); @@ -134,7 +134,7 @@ public class ClearActionIT { @Test public void fail_if_not_global_admin() throws IOException { - ProjectDto project = dbTester.components().insertPrivateProjectDto(); + ProjectDto project = dbTester.components().insertPrivateProject().getProjectDto(); dao.insert(dbTester.getSession(), "branch1", stringToInputStream("test data")); DbInputStream branchDataIs = dao.selectData(dbTester.getSession(), "branch1"); assertThat(branchDataIs).isNotNull(); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/scannercache/ws/GetActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/scannercache/ws/GetActionIT.java index 3535aed77d4..26fac5d235a 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/scannercache/ws/GetActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/scannercache/ws/GetActionIT.java @@ -67,9 +67,9 @@ public class GetActionIT { @Test public void get_data_for_project() throws IOException { - ProjectDto project1 = dbTester.components().insertPrivateProjectDto(); + ProjectDto project1 = dbTester.components().insertPrivateProject().getProjectDto(); BranchDto branch = dbTester.components().insertProjectBranch(project1); - ProjectDto project2 = dbTester.components().insertPrivateProjectDto(); + ProjectDto project2 = dbTester.components().insertPrivateProject().getProjectDto(); dao.insert(dbTester.getSession(), project1.getUuid(), stringToCompressedInputStream("test data1")); dao.insert(dbTester.getSession(), branch.getUuid(), stringToCompressedInputStream("test data2")); @@ -87,7 +87,7 @@ public class GetActionIT { @Test public void get_uncompressed_data_for_project() throws IOException { - ProjectDto project1 = dbTester.components().insertPrivateProjectDto(); + ProjectDto project1 = dbTester.components().insertPrivateProject().getProjectDto(); dao.insert(dbTester.getSession(), project1.getUuid(), stringToCompressedInputStream("test data1")); @@ -103,7 +103,7 @@ public class GetActionIT { @Test public void get_data_for_branch() throws IOException { - ProjectDto project1 = dbTester.components().insertPrivateProjectDto(); + ProjectDto project1 = dbTester.components().insertPrivateProject().getProjectDto(); BranchDto branch = dbTester.components().insertProjectBranch(project1); dao.insert(dbTester.getSession(), project1.getUuid(), stringToCompressedInputStream("test data1")); @@ -130,7 +130,7 @@ public class GetActionIT { @Test public void return_not_found_if_branch_mixed_with_pr() { - ProjectDto project1 = dbTester.components().insertPrivateProjectDto(); + ProjectDto project1 = dbTester.components().insertPrivateProject().getProjectDto(); BranchDto branch = dbTester.components().insertProjectBranch(project1); userSession.logIn().addProjectPermission(SCAN, project1); @@ -143,7 +143,7 @@ public class GetActionIT { @Test public void return_not_found_if_cache_not_found() { - ProjectDto project1 = dbTester.components().insertPrivateProjectDto(); + ProjectDto project1 = dbTester.components().insertPrivateProject().getProjectDto(); userSession.logIn().addProjectPermission(SCAN, project1); TestRequest request = wsTester @@ -154,7 +154,7 @@ public class GetActionIT { @Test public void fail_if_no_permissions() { - ProjectDto project = dbTester.components().insertPrivateProjectDto(); + ProjectDto project = dbTester.components().insertPrivateProject().getProjectDto(); userSession.logIn().addProjectPermission(UserRole.CODEVIEWER, project); TestRequest request = wsTester .newRequest() diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/setting/ws/ListDefinitionsActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/setting/ws/ListDefinitionsActionIT.java index 96c564fa6e5..40c4469e5a2 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/setting/ws/ListDefinitionsActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/setting/ws/ListDefinitionsActionIT.java @@ -35,7 +35,6 @@ import org.sonar.db.DbClient; import org.sonar.db.DbTester; import org.sonar.db.component.ComponentDbTester; import org.sonar.db.component.ComponentDto; -import org.sonar.db.component.ComponentTesting; import org.sonar.db.permission.GlobalPermission; import org.sonar.server.component.TestComponentFinder; import org.sonar.server.exceptions.ForbiddenException; @@ -83,7 +82,7 @@ public class ListDefinitionsActionIT { @Before public void setUp() { - project = db.components().insertPrivateProject(); + project = db.components().insertPrivateProject().getMainBranchComponent(); } @Test diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/setting/ws/ResetActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/setting/ws/ResetActionIT.java index fe88307c973..869697b83fa 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/setting/ws/ResetActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/setting/ws/ResetActionIT.java @@ -85,7 +85,7 @@ public class ResetActionIT { @Before public void setUp() { - project = db.components().insertPrivateProject(); + project = db.components().insertPrivateProject().getMainBranchComponent(); } @Test @@ -202,7 +202,7 @@ public class ResetActionIT { @Test public void remove_setting_on_branch() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); String branchName = randomAlphanumeric(248); ComponentDto branch = db.components().insertProjectBranch(project, b -> b.setKey(branchName)); definitions.addComponent(PropertyDefinition.builder("foo").onQualifiers(PROJECT).build()); @@ -354,7 +354,7 @@ public class ResetActionIT { @Test public void fail_for_property_without_definition_when_set_on_projectCopy_component() { ComponentDto view = db.components().insertPublicPortfolio(); - ComponentDto projectCopy = db.components().insertComponent(ComponentTesting.newProjectCopy("a", db.components().insertPrivateProject(), view)); + ComponentDto projectCopy = db.components().insertComponent(ComponentTesting.newProjectCopy("a", db.components().insertPrivateProject().getMainBranchComponent(), view)); failForPropertyWithoutDefinitionOnUnsupportedComponent(view, projectCopy); } @@ -373,7 +373,7 @@ public class ResetActionIT { @Test public void fail_when_branch_not_found() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); logInAsProjectAdmin(project); ComponentDto branch = db.components().insertProjectBranch(project); String settingKey = "not_allowed_on_branch"; @@ -391,7 +391,7 @@ public class ResetActionIT { @Test public void fail_when_setting_key_is_defined_in_sonar_properties() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); logInAsProjectAdmin(project); String settingKey = ProcessProperties.Property.JDBC_URL.getKey(); @@ -485,7 +485,7 @@ public class ResetActionIT { } private ComponentDto randomPublicOrPrivateProject() { - return new Random().nextBoolean() ? db.components().insertPrivateProject() : db.components().insertPublicProject(); + return new Random().nextBoolean() ? db.components().insertPrivateProject().getMainBranchComponent() : db.components().insertPublicProject().getMainBranchComponent(); } } diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/setting/ws/SetActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/setting/ws/SetActionIT.java index b45cf7493ff..b76e8cd8a7b 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/setting/ws/SetActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/setting/ws/SetActionIT.java @@ -147,7 +147,7 @@ public class SetActionIT { @Test public void persist_new_project_setting() { propertyDb.insertProperty(newGlobalPropertyDto("my.key", "my global value"), null, null, null, null); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); logInAsProjectAdministrator(project); callForProjectSettingByKey("my.key", "my project value", project.getKey()); @@ -159,7 +159,7 @@ public class SetActionIT { @Test public void persist_project_property_with_project_admin_permission() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); logInAsProjectAdministrator(project); callForProjectSettingByKey("my.key", "my value", project.getKey()); @@ -171,7 +171,7 @@ public class SetActionIT { public void update_existing_project_setting() { propertyDb.insertProperty(newGlobalPropertyDto("my.key", "my global value"), null, null, null, null); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); propertyDb.insertProperty(newComponentPropertyDto("my.key", "my project value", project), project.getKey(), project.name(), null, null); assertComponentSetting("my.key", "my project value", project.uuid()); @@ -303,7 +303,7 @@ public class SetActionIT { .type(PropertyType.STRING) .build())) .build()); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); propertyDb.insertProperties(null, null, null, null, newGlobalPropertyDto("my.key", "1"), newGlobalPropertyDto("my.key.1.firstField", "oldFirstValue"), @@ -869,7 +869,7 @@ public class SetActionIT { @Test public void fail_for_property_without_definition_when_set_on_projectCopy_component() { ComponentDto view = db.components().insertPrivatePortfolio(); - ComponentDto projectCopy = db.components().insertComponent(ComponentTesting.newProjectCopy("a", db.components().insertPrivateProject(), view)); + ComponentDto projectCopy = db.components().insertComponent(ComponentTesting.newProjectCopy("a", db.components().insertPrivateProject().getMainBranchComponent(), view)); failForPropertyWithoutDefinitionOnUnsupportedComponent(view, projectCopy); } @@ -1142,7 +1142,7 @@ public class SetActionIT { .fields(newArrayList(PropertyFieldDefinition.build("firstField").name("First Field").type(PropertyType.STRING).build())) .build()); i18n.put("qualifier." + Qualifiers.PROJECT, "Project"); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); logInAsProjectAdministrator(project); assertThatThrownBy(() -> { @@ -1168,7 +1168,7 @@ public class SetActionIT { @Test public void fail_when_setting_key_is_defined_in_sonar_properties() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); logInAsProjectAdministrator(project); String settingKey = ProcessProperties.Property.JDBC_URL.getKey(); @@ -1284,6 +1284,6 @@ public class SetActionIT { } private ComponentDto randomPublicOrPrivateProject() { - return new Random().nextBoolean() ? db.components().insertPrivateProject() : db.components().insertPublicProject(); + return new Random().nextBoolean() ? db.components().insertPrivateProject().getMainBranchComponent() : db.components().insertPublicProject().getMainBranchComponent(); } } diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/setting/ws/ValuesActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/setting/ws/ValuesActionIT.java index 1906ad4bde8..1673b634a40 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/setting/ws/ValuesActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/setting/ws/ValuesActionIT.java @@ -84,7 +84,7 @@ public class ValuesActionIT { @Before public void setUp() { - project = db.components().insertPrivateProject(); + project = db.components().insertPrivateProject().getMainBranchComponent(); } @Test @@ -792,7 +792,7 @@ public class ValuesActionIT { @Test public void fail_when_setting_key_is_defined_in_sonar_properties() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.logIn().addProjectPermission(UserRole.USER, project); String settingKey = ProcessProperties.Property.JDBC_URL.getKey(); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/source/ws/IndexActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/source/ws/IndexActionIT.java index d617a827536..b5a99a69b2b 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/source/ws/IndexActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/source/ws/IndexActionIT.java @@ -54,7 +54,7 @@ public class IndexActionIT { @Test public void get_json() throws Exception { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(CODEVIEWER, project); ComponentDto file = db.components().insertComponent(newFileDto(project)); insertFileWithData(file, newData("public class HelloWorld {", "}")); @@ -73,7 +73,7 @@ public class IndexActionIT { @Test public void limit_range() throws Exception { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(CODEVIEWER, project); ComponentDto file = db.components().insertComponent(newFileDto(project)); insertFileWithData(file, newData("/**", " */", "public class HelloWorld {", "}", "", "foo")); @@ -94,7 +94,7 @@ public class IndexActionIT { @Test public void fail_when_missing_code_viewer_permission() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(USER, project); ComponentDto file = db.components().insertComponent(newFileDto(project)); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/source/ws/IssueSnippetsActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/source/ws/IssueSnippetsActionIT.java index 730c9aabb37..f3a8bc12f59 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/source/ws/IssueSnippetsActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/source/ws/IssueSnippetsActionIT.java @@ -77,7 +77,7 @@ public class IssueSnippetsActionIT { @Before public void setUp() { - project = db.components().insertPrivateProject("projectUuid"); + project = db.components().insertPrivateProject("projectUuid").getMainBranchComponent(); HtmlSourceDecorator htmlSourceDecorator = mock(HtmlSourceDecorator.class); when(htmlSourceDecorator.getDecoratedSourceAsHtml(anyString(), anyString(), anyString())) diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/source/ws/LinesActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/source/ws/LinesActionIT.java index 665f524774a..d6a4da3abe1 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/source/ws/LinesActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/source/ws/LinesActionIT.java @@ -78,7 +78,7 @@ public class LinesActionIT { @Test public void show_source() { - ComponentDto privateProject = db.components().insertPrivateProject(); + ComponentDto privateProject = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = insertFileWithData(FileSourceTesting.newFakeData(3).build(), privateProject); setUserWithValidPermission(file, privateProject); @@ -91,7 +91,7 @@ public class LinesActionIT { @Test public void fail_to_show_source_if_no_source_found() { - ComponentDto privateProject = db.components().insertPrivateProject(); + ComponentDto privateProject = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = insertFile(privateProject); setUserWithValidPermission(file, privateProject); @@ -104,7 +104,7 @@ public class LinesActionIT { @Test public void show_paginated_lines() { - ComponentDto privateProject = db.components().insertPrivateProject(); + ComponentDto privateProject = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = insertFileWithData(FileSourceTesting.newFakeData(3).build(), privateProject); setUserWithValidPermission(file, privateProject); @@ -119,7 +119,7 @@ public class LinesActionIT { @Test public void branch() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); String branchName = randomAlphanumeric(248); ComponentDto branch = db.components().insertProjectBranch(project, b -> b.setKey(branchName)); @@ -145,7 +145,7 @@ public class LinesActionIT { @Test public void pull_request() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); String pullRequestKey = randomAlphanumeric(100); ComponentDto branch = db.components().insertProjectBranch(project, b -> b.setBranchType(PULL_REQUEST).setKey(pullRequestKey)); ComponentDto file = db.components().insertComponent(newFileDto(branch, project.uuid())); @@ -191,7 +191,7 @@ public class LinesActionIT { @Test public void fail_when_file_is_removed() { - ComponentDto privateProject = db.components().insertPrivateProject(); + ComponentDto privateProject = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = newFileDto(privateProject).setKey("file-key").setEnabled(false); db.components().insertComponents(file); setUserWithValidPermission(file, privateProject); @@ -203,7 +203,7 @@ public class LinesActionIT { @Test public void check_permission() { - ComponentDto privateProject = db.components().insertPrivateProject(); + ComponentDto privateProject = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = insertFileWithData(FileSourceTesting.newFakeData(1).build(), privateProject); userSession.logIn("login"); @@ -218,7 +218,7 @@ public class LinesActionIT { @Test public void display_deprecated_fields() { - ComponentDto privateProject = db.components().insertPrivateProject(); + ComponentDto privateProject = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = insertFileWithData(FileSourceTesting.newFakeData(1).build(), privateProject); setUserWithValidPermission(file, privateProject); @@ -235,7 +235,7 @@ public class LinesActionIT { dataBuilder.addLines(DbFileSources.Line.newBuilder().setLine(2).setScmDate(2000L).build()); // only this line should be considered as new dataBuilder.addLines(DbFileSources.Line.newBuilder().setLine(3).setScmDate(3000L).build()); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); insertPeriod(project, 2000L); ComponentDto file = insertFileWithData(dataBuilder.build(), project); setUserWithValidPermission(file, project); @@ -248,7 +248,7 @@ public class LinesActionIT { @Test public void use_deprecated_overall_coverage_fields_if_exists() { - ComponentDto privateProject = db.components().insertPrivateProject(); + ComponentDto privateProject = db.components().insertPrivateProject().getMainBranchComponent(); DbFileSources.Data.Builder dataBuilder = DbFileSources.Data.newBuilder(); ComponentDto file = insertFileWithData(dataBuilder.addLines(newLineBuilder() .setDeprecatedOverallLineHits(1) @@ -270,7 +270,7 @@ public class LinesActionIT { @Test public void use_deprecated_ut_coverage_fields_if_exists() { - ComponentDto privateProject = db.components().insertPrivateProject(); + ComponentDto privateProject = db.components().insertPrivateProject().getMainBranchComponent(); DbFileSources.Data.Builder dataBuilder = DbFileSources.Data.newBuilder(); ComponentDto file = insertFileWithData(dataBuilder.addLines(newLineBuilder() .setDeprecatedUtLineHits(1) @@ -289,7 +289,7 @@ public class LinesActionIT { @Test public void use_deprecated_it_coverage_fields_if_exists() { - ComponentDto privateProject = db.components().insertPrivateProject(); + ComponentDto privateProject = db.components().insertPrivateProject().getMainBranchComponent(); DbFileSources.Data.Builder dataBuilder = DbFileSources.Data.newBuilder(); ComponentDto file = insertFileWithData(dataBuilder.addLines(newLineBuilder() .setDeprecatedItLineHits(1) @@ -305,7 +305,7 @@ public class LinesActionIT { @Test public void fail_if_branch_does_not_exist() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); userSession.addProjectPermission(UserRole.USER, project); db.components().insertProjectBranch(project, b -> b.setKey("my_branch")); @@ -320,7 +320,7 @@ public class LinesActionIT { @Test public void fail_when_uuid_and_branch_params_are_used_together() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto file = db.components().insertComponent(newFileDto(project)); userSession.addProjectPermission(UserRole.USER, project); db.components().insertProjectBranch(project, b -> b.setKey("my_branch")); @@ -335,7 +335,7 @@ public class LinesActionIT { @Test public void fail_when_using_branch_uuid() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); ComponentDto branch = db.components().insertProjectBranch(project); userSession.addProjectPermission(UserRole.USER, project); @@ -348,7 +348,7 @@ public class LinesActionIT { @Test public void hide_scmAuthors() { - ComponentDto publicProject = db.components().insertPublicProject(); + ComponentDto publicProject = db.components().insertPublicProject().getMainBranchComponent(); userSession.registerComponents(publicProject); DbFileSources.Data data = DbFileSources.Data.newBuilder() @@ -365,7 +365,7 @@ public class LinesActionIT { @Test public void show_scmAuthors() { - ComponentDto publicProject = db.components().insertPublicProject(); + ComponentDto publicProject = db.components().insertPublicProject().getMainBranchComponent(); UserDto user = db.users().insertUser(); userSession.logIn(user) .registerComponents(publicProject); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/source/ws/RawActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/source/ws/RawActionIT.java index 518e4155fd1..5c49515e166 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/source/ws/RawActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/source/ws/RawActionIT.java @@ -57,7 +57,7 @@ public class RawActionIT { @Test public void raw_from_file() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(UserRole.CODEVIEWER, project); ComponentDto file = db.components().insertComponent(newFileDto(project)); db.fileSources().insertFileSource(file, s -> s.setSourceData( @@ -75,7 +75,7 @@ public class RawActionIT { @Test public void raw_from_branch_file() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(UserRole.CODEVIEWER, project); String branchName = randomAlphanumeric(248); ComponentDto branch = db.components().insertProjectBranch(project, b -> b.setKey(branchName)); @@ -106,7 +106,7 @@ public class RawActionIT { @Test public void fail_on_unknown_branch() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(UserRole.CODEVIEWER, project); ComponentDto branch = db.components().insertProjectBranch(project); ComponentDto file = db.components().insertComponent(newFileDto(branch, project.uuid())); @@ -122,7 +122,7 @@ public class RawActionIT { @Test public void fail_when_using_branch_db_key() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(UserRole.CODEVIEWER, project); ComponentDto branch = db.components().insertProjectBranch(project); ComponentDto file = db.components().insertComponent(newFileDto(branch, project.uuid())); @@ -137,7 +137,7 @@ public class RawActionIT { @Test public void fail_when_wrong_permission() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); userSession.addProjectPermission(UserRole.ISSUE_ADMIN, project); ComponentDto file = db.components().insertComponent(newFileDto(project)); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/source/ws/ScmActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/source/ws/ScmActionIT.java index d570e848e8c..8ec90888d79 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/source/ws/ScmActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/source/ws/ScmActionIT.java @@ -64,7 +64,7 @@ public class ScmActionIT { @Before public void setUp() { - project = dbTester.components().insertPrivateProject(PROJECT_UUID); + project = dbTester.components().insertPrivateProject(PROJECT_UUID).getMainBranchComponent(); file = ComponentTesting.newFileDto(project, null, FILE_UUID).setKey(FILE_KEY); dbClient.componentDao().insertOnMainBranch(dbTester.getSession(), file); dbTester.getSession().commit(); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/ui/ws/ComponentActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/ui/ws/ComponentActionIT.java index 06ffe2da299..3e99eb68587 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/ui/ws/ComponentActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/ui/ws/ComponentActionIT.java @@ -250,18 +250,18 @@ public class ComponentActionIT { @Test public void return_canBrowseAllChildProjects_when_component_is_an_application() { db.qualityGates().createDefaultQualityGate(); - ComponentDto application1 = db.components().insertPrivateApplication(); - ComponentDto project11 = db.components().insertPrivateProject(); - ComponentDto project12 = db.components().insertPrivateProject(); + ComponentDto application1 = db.components().insertPrivateApplication().getMainBranchComponent(); + ComponentDto project11 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project12 = db.components().insertPrivateProject().getMainBranchComponent(); userSession.registerApplication( toProjectDto(application1, 1L), toProjectDto(project11, 1L), toProjectDto(project12, 1L)); userSession.addProjectPermission(UserRole.USER, application1, project11, project12); - ComponentDto application2 = db.components().insertPrivateApplication(); - ComponentDto project21 = db.components().insertPrivateProject(); - ComponentDto project22 = db.components().insertPrivateProject(); + ComponentDto application2 = db.components().insertPrivateApplication().getMainBranchComponent(); + ComponentDto project21 = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto project22 = db.components().insertPrivateProject().getMainBranchComponent(); userSession.registerApplication( toProjectDto(application2, 1L), toProjectDto(project21, 1L), @@ -298,7 +298,7 @@ public class ComponentActionIT { @Test public void return_component_info_when_file_on_master() { db.qualityGates().createDefaultQualityGate(); - ComponentDto main = componentDbTester.insertPrivateProject(p -> p.setName("Sample").setKey("sample")); + ComponentDto main = componentDbTester.insertPrivateProject(p -> p.setName("Sample").setKey("sample")).getMainBranchComponent(); userSession.addProjectPermission(UserRole.USER, main); init(); @@ -315,7 +315,7 @@ public class ComponentActionIT { @Test public void return_component_info_when_file_on_branch() { db.qualityGates().createDefaultQualityGate(); - ComponentDto project = componentDbTester.insertPrivateProject(p -> p.setName("Sample").setKey("sample")); + ComponentDto project = componentDbTester.insertPrivateProject(p -> p.setName("Sample").setKey("sample")).getMainBranchComponent(); String branchName = "feature1"; ComponentDto branch = componentDbTester.insertProjectBranch(project, b -> b.setKey(branchName)); userSession.addProjectPermission(UserRole.USER, project); @@ -387,7 +387,7 @@ public class ComponentActionIT { @Test public void return_quality_gate_defined_on_project() { db.qualityGates().createDefaultQualityGate(); - ProjectDto project = db.components().insertPrivateProjectDto(); + ProjectDto project = db.components().insertPrivateProject().getProjectDto(); QualityGateDto qualityGateDto = db.qualityGates().insertQualityGate(qg -> qg.setName("Sonar way")); db.qualityGates().associateProjectToQualityGate(project, qualityGateDto); userSession.addProjectPermission(UserRole.USER, project); @@ -399,7 +399,7 @@ public class ComponentActionIT { @Test public void quality_gate_for_a_branch() { db.qualityGates().createDefaultQualityGate(); - ProjectDto project = db.components().insertPrivateProjectDto(); + ProjectDto project = db.components().insertPrivateProject().getProjectDto(); BranchDto branch = db.components().insertProjectBranch(project, b -> b.setBranchType(BranchType.BRANCH)); QualityGateDto qualityGateDto = db.qualityGates().insertQualityGate(qg -> qg.setName("Sonar way")); db.qualityGates().associateProjectToQualityGate(project, qualityGateDto); @@ -418,7 +418,7 @@ public class ComponentActionIT { @Test public void return_default_quality_gate() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); db.qualityGates().createDefaultQualityGate(qg -> qg.setName("Sonar way")); userSession.addProjectPermission(UserRole.USER, project); init(); @@ -438,13 +438,13 @@ public class ComponentActionIT { @Test public void return_extensions_for_application() { db.qualityGates().createDefaultQualityGate(); - ProjectDto project = db.components().insertPrivateProjectDto(); + ProjectDto project = db.components().insertPrivateProject().getProjectDto(); Page page = Page.builder("my_plugin/app_page") .setName("App Page") .setScope(COMPONENT) .setComponentQualifiers(Qualifier.VIEW, Qualifier.APP) .build(); - ComponentDto application = componentDbTester.insertPublicApplication(); + ComponentDto application = componentDbTester.insertPublicApplication().getMainBranchComponent(); QualityGateDto qualityGateDto = db.qualityGates().insertQualityGate(qg -> qg.setName("Sonar way")); db.qualityGates().associateProjectToQualityGate(project, qualityGateDto); userSession.registerComponents(application); @@ -627,7 +627,7 @@ public class ComponentActionIT { @Test public void should_return_private_flag_for_project() { db.qualityGates().createDefaultQualityGate(); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); init(); userSession.logIn() @@ -639,7 +639,7 @@ public class ComponentActionIT { @Test public void should_return_public_flag_for_project() { db.qualityGates().createDefaultQualityGate(); - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); init(); userSession.logIn() @@ -651,7 +651,7 @@ public class ComponentActionIT { @Test public void canApplyPermissionTemplate_is_true_if_logged_in_as_administrator() { db.qualityGates().createDefaultQualityGate(); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); init(createPages()); userSession.logIn() @@ -668,7 +668,7 @@ public class ComponentActionIT { @Test public void canUpdateProjectVisibilityToPrivate_is_true_if_logged_in_as_project_administrator() { db.qualityGates().createDefaultQualityGate(); - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); init(createPages()); userSession.logIn().addProjectPermission(UserRole.ADMIN, project); @@ -712,7 +712,7 @@ public class ComponentActionIT { .setKey("org.codehaus.sonar:sonar") .setName("Sonarqube") .setDescription("Open source platform for continuous inspection of code quality"); - componentDbTester.insertPrivateProject(project); + componentDbTester.insertPrivateProject(project).getMainBranchComponent(); SnapshotDto analysis = newAnalysis(project) .setCreatedAt(parseDateTime("2016-12-06T11:44:00+0200").getTime()) .setProjectVersion("6.3") @@ -726,7 +726,7 @@ public class ComponentActionIT { createQProfile("qp1", "Sonar Way Java", "java"), createQProfile("qp2", "Sonar Way Xoo", "xoo")); QualityGateDto qualityGateDto = db.qualityGates().insertQualityGate(qg -> qg.setName("Sonar way")); - db.qualityGates().associateProjectToQualityGate(db.components().getProjectDto(project), qualityGateDto); + db.qualityGates().associateProjectToQualityGate(db.components().getProjectDtoByMainBranch(project), qualityGateDto); userSession.logIn(user) .addProjectPermission(UserRole.USER, project) .addProjectPermission(UserRole.ADMIN, project); @@ -775,7 +775,7 @@ public class ComponentActionIT { .setName("Polop") .setDescription("test project") .setQualifier(Qualifiers.PROJECT) - .setScope(Scopes.PROJECT)); + .setScope(Scopes.PROJECT)).getMainBranchComponent(); } private void init(Page... pages) { diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/ui/ws/MarketplaceActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/ui/ws/MarketplaceActionIT.java index 001e1d35889..fbf818e7152 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/ui/ws/MarketplaceActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/ui/ws/MarketplaceActionIT.java @@ -116,7 +116,7 @@ public class MarketplaceActionIT { } private void setNcloc(double ncloc) { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); db.getDbClient().projectDao().updateNcloc(db.getSession(), project.uuid(), (long) ncloc); db.commit(); } diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/user/ws/CurrentActionHomepageIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/user/ws/CurrentActionHomepageIT.java index 2fe8f9dc50b..1e118a61c8b 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/user/ws/CurrentActionHomepageIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/user/ws/CurrentActionHomepageIT.java @@ -114,7 +114,7 @@ public class CurrentActionHomepageIT { @UseDataProvider("enterpriseAndAbove") public void return_homepage_when_set_to_an_application(EditionProvider.Edition edition) { setPlatformEdition(edition); - ComponentDto application = db.components().insertPrivateApplication(); + ComponentDto application = db.components().insertPrivateApplication().getMainBranchComponent(); UserDto user = db.users().insertUser(u -> u.setHomepageType("APPLICATION").setHomepageParameter(application.uuid())); userSessionRule.logIn(user).addProjectPermission(USER, application); @@ -129,7 +129,7 @@ public class CurrentActionHomepageIT { @UseDataProvider("enterpriseAndAbove") public void return_default_homepage_when_set_to_an_application_but_no_rights_on_this_application(EditionProvider.Edition edition) { setPlatformEdition(edition); - ComponentDto application = db.components().insertPrivateApplication(); + ComponentDto application = db.components().insertPrivateApplication().getMainBranchComponent(); UserDto user = db.users().insertUser(u -> u.setHomepageType("APPLICATION").setHomepageParameter(application.uuid())); userSessionRule.logIn(user); @@ -144,7 +144,7 @@ public class CurrentActionHomepageIT { @UseDataProvider("allEditions") public void return_homepage_when_set_to_a_project(EditionProvider.Edition edition) { setPlatformEdition(edition); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); UserDto user = db.users().insertUser(u -> u.setHomepageType("PROJECT").setHomepageParameter(project.uuid())); userSessionRule.logIn(user).addProjectPermission(USER, project); @@ -159,7 +159,7 @@ public class CurrentActionHomepageIT { @UseDataProvider("allEditions") public void return_default_homepage_when_set_to_a_project_but_no_rights_on_this_project(EditionProvider.Edition edition) { setPlatformEdition(edition); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); UserDto user = db.users().insertUser(u -> u.setHomepageType("PROJECT").setHomepageParameter(project.uuid())); userSessionRule.logIn(user); @@ -172,7 +172,7 @@ public class CurrentActionHomepageIT { @Test public void return_homepage_when_set_to_a_branch() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); String branchName = randomAlphanumeric(248); ComponentDto branch = db.components().insertProjectBranch(project, b -> b.setKey(branchName)); UserDto user = db.users().insertUser(u -> u.setHomepageType("PROJECT").setHomepageParameter(branch.uuid())); @@ -210,7 +210,7 @@ public class CurrentActionHomepageIT { @Test public void fallback_when_edition_is_null() { setPlatformEdition(null); - ComponentDto application = db.components().insertPrivateApplication(); + ComponentDto application = db.components().insertPrivateApplication().getMainBranchComponent(); UserDto user = db.users().insertUser(u -> u.setHomepageType("APPLICATION").setHomepageParameter(application.uuid())); userSessionRule.logIn(user.getLogin()); @@ -236,7 +236,7 @@ public class CurrentActionHomepageIT { @UseDataProvider("belowEnterprise") public void fallback_when_user_homepage_application_and_edition_below_enterprise(EditionProvider.Edition edition) { setPlatformEdition(edition); - ComponentDto application = db.components().insertPrivateApplication(); + ComponentDto application = db.components().insertPrivateApplication().getMainBranchComponent(); UserDto user = db.users().insertUser(u -> u.setHomepageType("APPLICATION").setHomepageParameter(application.uuid())); userSessionRule.logIn(user.getLogin()); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/user/ws/CurrentActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/user/ws/CurrentActionIT.java index 6a78528033c..0d1d89ef5b1 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/user/ws/CurrentActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/user/ws/CurrentActionIT.java @@ -206,7 +206,7 @@ public class CurrentActionIT { @Test public void json_example() { - ComponentDto componentDto = db.components().insertPrivateProject(u -> u.setUuid("UUID-of-the-death-star").setKey("death-star-key")); + ComponentDto componentDto = db.components().insertPrivateProject(u -> u.setUuid("UUID-of-the-death-star").setKey("death-star-key")).getMainBranchComponent(); UserDto obiwan = db.users().insertUser(user -> user .setLogin("obiwan.kenobi") .setName("Obiwan Kenobi") @@ -221,7 +221,7 @@ public class CurrentActionIT { .logIn(obiwan) .addPermission(SCAN) .addPermission(ADMINISTER_QUALITY_PROFILES) - .addProjectPermission(USER, db.components().getProjectDto(componentDto)); + .addProjectPermission(USER, db.components().getProjectDtoByMainBranch(componentDto)); db.users().insertMember(db.users().insertGroup(newGroupDto().setName("Jedi")), obiwan); db.users().insertMember(db.users().insertGroup(newGroupDto().setName("Rebel")), obiwan); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/user/ws/DeactivateActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/user/ws/DeactivateActionIT.java index 6ed266dfa16..7b51b96eff9 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/user/ws/DeactivateActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/user/ws/DeactivateActionIT.java @@ -145,7 +145,7 @@ public class DeactivateActionIT { createAdminUser(); logInAsSystemAdministrator(); UserDto user = db.users().insertUser(); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); db.properties().insertProperty(newUserPropertyDto(user), null, null, null, user.getLogin()); db.properties().insertProperty(newUserPropertyDto(user), null, null, null, user.getLogin()); db.properties().insertProperty(newUserPropertyDto(user).setComponentUuid(project.uuid()), project.getKey(), @@ -162,7 +162,7 @@ public class DeactivateActionIT { createAdminUser(); logInAsSystemAdministrator(); UserDto user = db.users().insertUser(); - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); db.users().insertGlobalPermissionOnUser(user, GlobalPermission.SCAN); db.users().insertGlobalPermissionOnUser(user, GlobalPermission.ADMINISTER_QUALITY_PROFILES); db.users().insertProjectPermissionOnUser(user, UserRole.USER, project); @@ -210,8 +210,8 @@ public class DeactivateActionIT { createAdminUser(); logInAsSystemAdministrator(); UserDto user = db.users().insertUser(); - ComponentDto project = db.components().insertPrivateProject(); - ComponentDto anotherProject = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); + ComponentDto anotherProject = db.components().insertPrivateProject().getMainBranchComponent(); db.properties().insertProperty(new PropertyDto().setKey("sonar.issues.defaultAssigneeLogin").setValue(user.getLogin()) .setComponentUuid(project.uuid()), project.getKey(), project.name(), project.qualifier(), user.getLogin()); db.properties().insertProperty(new PropertyDto().setKey("sonar.issues.defaultAssigneeLogin").setValue(user.getLogin()) @@ -276,8 +276,8 @@ public class DeactivateActionIT { public void deactivate_user_deletes_their_dismissed_messages() { createAdminUser(); logInAsSystemAdministrator(); - ProjectDto project1 = db.components().insertPrivateProjectDto(); - ProjectDto project2 = db.components().insertPrivateProjectDto(); + ProjectDto project1 = db.components().insertPrivateProject().getProjectDto(); + ProjectDto project2 = db.components().insertPrivateProject().getProjectDto(); UserDto user = db.users().insertUser(); db.users().insertUserDismissedMessage(user, project1, CeTaskMessageType.SUGGEST_DEVELOPER_EDITION_UPGRADE); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/user/ws/SetHomepageActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/user/ws/SetHomepageActionIT.java index 03575fba96f..a84688abd63 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/user/ws/SetHomepageActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/user/ws/SetHomepageActionIT.java @@ -78,7 +78,7 @@ public class SetHomepageActionIT { @Test public void set_project_homepage() { - ComponentDto project = db.components().insertPrivateProject(); + ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); UserDto user = db.users().insertUser(); userSession.logIn(user); @@ -97,7 +97,7 @@ public class SetHomepageActionIT { @Test public void set_branch_homepage() { - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); String branchName = randomAlphanumeric(248); ComponentDto branch = db.components().insertProjectBranch(project, b -> b.setKey(branchName)); UserDto user = db.users().insertUser(); @@ -185,7 +185,7 @@ public class SetHomepageActionIT { @Test public void set_application_homepage() { - ComponentDto application = db.components().insertPrivateApplication(); + ComponentDto application = db.components().insertPrivateApplication().getMainBranchComponent(); UserDto user = db.users().insertUser(); userSession.logIn(user); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/usergroups/ws/DeleteActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/usergroups/ws/DeleteActionIT.java index 81fa9575690..8243090d3fc 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/usergroups/ws/DeleteActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/usergroups/ws/DeleteActionIT.java @@ -144,7 +144,7 @@ public class DeleteActionIT { addAdmin(); insertDefaultGroup(); GroupDto group = db.users().insertGroup(); - ComponentDto project = componentTester.insertPrivateProject(); + ComponentDto project = componentTester.insertPrivateProject().getMainBranchComponent(); db.users().insertProjectPermissionOnGroup(group, UserRole.ADMIN, project); loginAsAdmin(); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/usertoken/ws/GenerateActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/usertoken/ws/GenerateActionIT.java index 80f28384922..0911b363362 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/usertoken/ws/GenerateActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/usertoken/ws/GenerateActionIT.java @@ -161,7 +161,7 @@ public class GenerateActionIT { @Test public void a_user_can_generate_projectAnalysisToken_with_the_project_global_scan_permission() { UserDto user = userLogin(); - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); userSession.addPermission(SCAN); GenerateWsResponse response = newRequest(null, TOKEN_NAME, PROJECT_ANALYSIS_TOKEN, project.getKey()); @@ -175,7 +175,7 @@ public class GenerateActionIT { @Test public void a_user_can_generate_projectAnalysisToken_with_the_project_scan_permission() { UserDto user = userLogin(); - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); userSession.addProjectPermission(SCAN.toString(), project); GenerateWsResponse response = newRequest(null, TOKEN_NAME, PROJECT_ANALYSIS_TOKEN, project.getKey()); @@ -189,7 +189,7 @@ public class GenerateActionIT { @Test public void a_user_can_generate_projectAnalysisToken_with_the_project_scan_permission_passing_login() { UserDto user = userLogin(); - ComponentDto project = db.components().insertPublicProject(); + ComponentDto project = db.components().insertPublicProject().getMainBranchComponent(); userSession.addProjectPermission(SCAN.toString(), project); GenerateWsResponse responseWithLogin = newRequest(user.getLogin(), TOKEN_NAME, PROJECT_ANALYSIS_TOKEN, project.getKey()); @@ -284,7 +284,7 @@ public class GenerateActionIT { @Test public void fail_if_projectAnalysisToken_created_without_project_permission() { userLogin(); - String projectKey = db.components().insertPublicProject().getKey(); + String projectKey = db.components().insertPublicProject().getMainBranchComponent().getKey(); assertThatThrownBy(() -> newRequest(null, "token 1", PROJECT_ANALYSIS_TOKEN, projectKey)) .isInstanceOf(ForbiddenException.class) diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/usertoken/ws/SearchActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/usertoken/ws/SearchActionIT.java index 66b2629bc80..8107381c437 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/usertoken/ws/SearchActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/usertoken/ws/SearchActionIT.java @@ -68,7 +68,7 @@ public class SearchActionIT { @Test public void search_json_example() { - ComponentDto project1 = db.components().insertPublicProject(p -> p.setKey("project-1").setName("Project 1")); + ComponentDto project1 = db.components().insertPublicProject(p -> p.setKey("project-1").setName("Project 1")).getMainBranchComponent(); UserDto user1 = db.users().insertUser(u -> u.setLogin("grace.hopper")); UserDto user2 = db.users().insertUser(u -> u.setLogin("ada.lovelace")); db.users().insertToken(user1, t -> t.setName("Project scan on Travis").setCreatedAt(1448523067221L)); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/webhook/ws/CreateActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/webhook/ws/CreateActionIT.java index d4fbf7ac326..9e0b8e2ed04 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/webhook/ws/CreateActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/webhook/ws/CreateActionIT.java @@ -96,7 +96,7 @@ public class CreateActionIT { @Test public void create_a_webhook_with_400_length_project_key() { String longProjectKey = generateStringWithLength(400); - ComponentDto project = componentDbTester.insertPrivateProject(componentDto -> componentDto.setKey(longProjectKey)); + ComponentDto project = componentDbTester.insertPrivateProject(componentDto -> componentDto.setKey(longProjectKey)).getMainBranchComponent(); userSession.logIn().addProjectPermission(UserRole.ADMIN, project); @@ -149,7 +149,7 @@ public class CreateActionIT { @Test public void create_a_webhook_on_project() { - ComponentDto project = componentDbTester.insertPrivateProject(); + ComponentDto project = componentDbTester.insertPrivateProject().getMainBranchComponent(); userSession.logIn().addProjectPermission(UserRole.ADMIN, project); @@ -181,7 +181,7 @@ public class CreateActionIT { @Test public void fail_if_crossing_maximum_quantity_of_webhooks_on_this_project() { - ProjectDto project = componentDbTester.insertPrivateProjectDto(); + ProjectDto project = componentDbTester.insertPrivateProject().getProjectDto(); for (int i = 0; i < 10; i++) { webhookDbTester.insertWebhook(project); } @@ -257,7 +257,7 @@ public class CreateActionIT { @Test public void throw_ForbiddenException_if_not_project_administrator() { - ComponentDto project = componentDbTester.insertPrivateProject(); + ComponentDto project = componentDbTester.insertPrivateProject().getMainBranchComponent(); userSession.logIn(); TestRequest request = wsActionTester.newRequest() .setParam(NAME_PARAM, NAME_WEBHOOK_EXAMPLE_001) diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/webhook/ws/DeleteActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/webhook/ws/DeleteActionIT.java index 3a318df31e7..48de6658adb 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/webhook/ws/DeleteActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/webhook/ws/DeleteActionIT.java @@ -89,7 +89,7 @@ public class DeleteActionIT { @Test public void delete_a_project_webhook() { - ProjectDto project = componentDbTester.insertPrivateProjectDto(); + ProjectDto project = componentDbTester.insertPrivateProject().getProjectDto(); WebhookDto dto = webhookDbTester.insertWebhook(project); webhookDeliveryDbTester.insert(newDto().setWebhookUuid(dto.getUuid())); webhookDeliveryDbTester.insert(newDto().setWebhookUuid(dto.getUuid())); @@ -151,7 +151,7 @@ public class DeleteActionIT { @Test public void fail_if_no_permission_on_webhook_scope_project() { - ProjectDto project = componentDbTester.insertPrivateProjectDto(); + ProjectDto project = componentDbTester.insertPrivateProject().getProjectDto(); WebhookDto dto = webhookDbTester.insertWebhook(project); userSession.logIn(); TestRequest request = wsActionTester.newRequest() diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/webhook/ws/ListActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/webhook/ws/ListActionIT.java index 6fa36bcbf52..346da9c3883 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/webhook/ws/ListActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/webhook/ws/ListActionIT.java @@ -169,7 +169,7 @@ public class ListActionIT { WebhookDto dto1 = webhookDbTester.insertGlobalWebhook(); WebhookDto dto2 = webhookDbTester.insertGlobalWebhook(); // insert a project-specific webhook, that should not be returned when listing global webhooks - webhookDbTester.insertWebhook(componentDbTester.insertPrivateProjectDto()); + webhookDbTester.insertWebhook(componentDbTester.insertPrivateProject().getProjectDto()); userSession.logIn().addPermission(GlobalPermission.ADMINISTER); @@ -185,7 +185,7 @@ public class ListActionIT { @Test public void list_project_webhooks_when_project_key_param_is_provided() { - ProjectDto project1 = componentDbTester.insertPrivateProjectDto(); + ProjectDto project1 = componentDbTester.insertPrivateProject().getProjectDto(); userSession.logIn().addProjectPermission(UserRole.ADMIN, project1); WebhookDto dto1 = webhookDbTester.insertWebhook(project1); @@ -249,7 +249,7 @@ public class ListActionIT { @Test public void throw_ForbiddenException_if_not_project_administrator() { - ComponentDto project = componentDbTester.insertPrivateProject(); + ComponentDto project = componentDbTester.insertPrivateProject().getMainBranchComponent(); TestRequest request = wsActionTester.newRequest() .setParam(PROJECT_KEY_PARAM, project.getKey()); userSession.logIn(); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/webhook/ws/UpdateActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/webhook/ws/UpdateActionIT.java index a614c3cad88..1a68e97da60 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/webhook/ws/UpdateActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/webhook/ws/UpdateActionIT.java @@ -88,7 +88,7 @@ public class UpdateActionIT { @Test public void update_a_project_webhook_with_required_fields() { - ProjectDto project = componentDbTester.insertPrivateProjectDto(); + ProjectDto project = componentDbTester.insertPrivateProject().getProjectDto(); WebhookDto dto = webhookDbTester.insertWebhook(project); userSession.logIn().addProjectPermission(UserRole.ADMIN, project); @@ -109,7 +109,7 @@ public class UpdateActionIT { @Test public void update_a_project_webhook_with_all_fields() { - ProjectDto project = componentDbTester.insertPrivateProjectDto(); + ProjectDto project = componentDbTester.insertPrivateProject().getProjectDto(); WebhookDto dto = webhookDbTester.insertWebhook(project); userSession.logIn().addProjectPermission(UserRole.ADMIN, project); @@ -178,7 +178,7 @@ public class UpdateActionIT { @Test public void fail_if_no_permission_on_webhook_scope_project() { - ProjectDto project = componentDbTester.insertPrivateProjectDto(); + ProjectDto project = componentDbTester.insertPrivateProject().getProjectDto(); WebhookDto dto = webhookDbTester.insertWebhook(project); userSession.logIn(); TestRequest request = wsActionTester.newRequest() @@ -207,7 +207,7 @@ public class UpdateActionIT { @Test public void fail_if_url_is_not_valid() { - ProjectDto project = componentDbTester.insertPrivateProjectDto(); + ProjectDto project = componentDbTester.insertPrivateProject().getProjectDto(); WebhookDto dto = webhookDbTester.insertWebhook(project); userSession.logIn().addProjectPermission(UserRole.ADMIN, project); TestRequest request = wsActionTester.newRequest() @@ -221,7 +221,7 @@ public class UpdateActionIT { @Test public void fail_if_credential_in_url_is_have_a_wrong_format() { - ProjectDto project = componentDbTester.insertPrivateProjectDto(); + ProjectDto project = componentDbTester.insertPrivateProject().getProjectDto(); WebhookDto dto = webhookDbTester.insertWebhook(project); userSession.logIn().addProjectPermission(UserRole.ADMIN, project); TestRequest request = wsActionTester.newRequest() diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/webhook/ws/WebhookDeliveriesActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/webhook/ws/WebhookDeliveriesActionIT.java index fd608bae072..0086cec2480 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/webhook/ws/WebhookDeliveriesActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/webhook/ws/WebhookDeliveriesActionIT.java @@ -65,8 +65,8 @@ public class WebhookDeliveriesActionIT { ComponentFinder componentFinder = TestComponentFinder.from(db); WebhookDeliveriesAction underTest = new WebhookDeliveriesAction(dbClient, userSession, componentFinder); ws = new WsActionTester(underTest); - project = db.components().insertPrivateProject(c -> c.setKey("my-project")); - otherProject = db.components().insertPrivateProject(c -> c.setKey("other-project")); + project = db.components().insertPrivateProject(c -> c.setKey("my-project")).getMainBranchComponent(); + otherProject = db.components().insertPrivateProject(c -> c.setKey("other-project")).getMainBranchComponent(); } @Test diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/webhook/ws/WebhookDeliveryActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/webhook/ws/WebhookDeliveryActionIT.java index 379bce8af7c..782afb9d43e 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/webhook/ws/WebhookDeliveryActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/webhook/ws/WebhookDeliveryActionIT.java @@ -61,7 +61,7 @@ public class WebhookDeliveryActionIT { ComponentFinder componentFinder = TestComponentFinder.from(db); WebhookDeliveryAction underTest = new WebhookDeliveryAction(dbClient, userSession, componentFinder); ws = new WsActionTester(underTest); - project = db.components().insertPrivateProject(c -> c.setKey("my-project")); + project = db.components().insertPrivateProject(c -> c.setKey("my-project")).getMainBranchComponent(); } @Test diff --git a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ce/ws/TaskFormatterTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ce/ws/TaskFormatterTest.java index 18fa6438c66..73d898d8272 100644 --- a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ce/ws/TaskFormatterTest.java +++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ce/ws/TaskFormatterTest.java @@ -87,7 +87,7 @@ public class TaskFormatterTest { @Test public void formatQueue_with_component_and_other_fields() { String uuid = "COMPONENT_UUID"; - db.components().insertPrivateProject((t) -> t.setUuid(uuid).setKey("COMPONENT_KEY").setName("Component Name")); + db.components().insertPrivateProject((t) -> t.setUuid(uuid).setKey("COMPONENT_KEY").setName("Component Name")).getMainBranchComponent(); UserDto user = db.users().insertUser(); CeQueueDto dto = new CeQueueDto(); diff --git a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/ws/SearchResponseFormatFormatOperationTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/ws/SearchResponseFormatFormatOperationTest.java index 6164d9dd78f..6f68df0a595 100644 --- a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/ws/SearchResponseFormatFormatOperationTest.java +++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/ws/SearchResponseFormatFormatOperationTest.java @@ -269,20 +269,20 @@ public class SearchResponseFormatFormatOperationTest { } private SearchResponseData newSearchResponseDataMainBranch() { - ComponentDto projectDto = db.components().insertPublicProject(); + ComponentDto projectDto = db.components().insertPublicProject().getMainBranchComponent(); BranchDto branchDto = db.getDbClient().branchDao().selectByUuid(db.getSession(), projectDto.uuid()).get(); return newSearchResponseData(projectDto, branchDto); } private SearchResponseData newSearchResponseDataBranch(String name) { - ProjectDto projectDto = db.components().insertPublicProjectDto(); + ProjectDto projectDto = db.components().insertPublicProject().getProjectDto(); BranchDto branch = db.components().insertProjectBranch(projectDto, b -> b.setKey(name)); ComponentDto branchComponent = db.components().getComponentDto(branch); return newSearchResponseData(branchComponent, branch); } private SearchResponseData newSearchResponseDataPr(String name) { - ProjectDto projectDto = db.components().insertPublicProjectDto(); + ProjectDto projectDto = db.components().insertPublicProject().getProjectDto(); BranchDto branch = db.components().insertProjectBranch(projectDto, b -> b.setKey(name).setBranchType(BranchType.PULL_REQUEST)); ComponentDto branchComponent = db.components().getComponentDto(branch); return newSearchResponseData(branchComponent, branch); -- 2.39.5