From 1df148803610cd54f182b8636f01c0e6ece92b19 Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Sat, 4 Jul 2015 00:34:24 +0200 Subject: [PATCH] Extract module sonar-db --- microbenchmark-template/pom.xml | 2 +- pom.xml | 6 + server/sonar-server-benchmarks/pom.xml | 2 +- .../benchmark/PersistFileSourcesStepTest.java | 2 +- .../benchmark/SourceDbBenchmarkTest.java | 4 +- server/sonar-server/pom.xml | 6 +- .../dbcleaner/IndexPurgeListener.java | 2 +- .../computation/dbcleaner/ProjectCleaner.java | 16 +- .../server/activity/ActivityService.java | 2 +- .../sonar/server/activity/db/ActivityDao.java | 12 +- .../activity/index/ActivityIndexer.java | 2 +- .../org/sonar/server/batch/BatchWsModule.java | 2 +- .../org/sonar/server/batch/GlobalAction.java | 10 +- .../org/sonar/server/batch/IssuesAction.java | 6 +- .../server/batch/ProjectRepositoryLoader.java | 14 +- .../component/ComponentCleanerService.java | 8 +- .../server/component/ComponentService.java | 8 +- .../DefaultRubyComponentService.java | 6 +- .../server/component/db/ComponentDao.java | 16 +- .../component/db/ComponentIndexDao.java | 8 +- .../server/component/db/ComponentLinkDao.java | 10 +- .../server/component/db/SnapshotDao.java | 12 +- .../sonar/server/component/ws/AppAction.java | 12 +- .../component/ws/ComponentJsonWriter.java | 2 +- .../server/component/ws/SearchAction.java | 6 +- .../computation/ComputationService.java | 4 +- .../sonar/server/computation/ReportQueue.java | 8 +- .../computation/activity/ActivityManager.java | 8 +- .../container/ComputeEngineContainerImpl.java | 4 +- .../computation/db/AnalysisReportDao.java | 14 +- .../computation/issue/BaseIssuesLoader.java | 8 +- .../computation/issue/NewDebtAggregator.java | 2 +- .../computation/issue/NewDebtCalculator.java | 2 +- .../computation/issue/RuleCacheLoader.java | 6 +- .../server/computation/issue/RuleImpl.java | 2 +- .../issue/TrackerBaseInputFactory.java | 4 +- .../issue}/UpdateConflictResolver.java | 6 +- .../measure/MeasureDtoToMeasure.java | 2 +- .../computation/measure/MeasureKey.java | 2 +- .../measure/MeasureRepository.java | 2 +- .../measure/MeasureRepositoryImpl.java | 6 +- .../measure/MeasureToMeasureDto.java | 2 +- .../NewCoverageMetricKeysModule.java | 2 +- .../computation/metric/MetricDtoToMetric.java | 2 +- .../metric/MetricRepositoryImpl.java | 4 +- .../qualitygate/QualityGateServiceImpl.java | 8 +- .../qualityprofile/QPMeasureData.java | 2 +- .../step/ApplyPermissionsStep.java | 6 +- .../step/CustomMeasuresCopyStep.java | 6 +- .../computation/step/FeedDebtModelStep.java | 4 +- .../computation/step/FeedPeriodsStep.java | 14 +- .../computation/step/FillComponentsStep.java | 4 +- .../step/FillMeasuresWithVariationsStep.java | 4 +- .../computation/step/IndexComponentsStep.java | 2 +- .../step/PersistComponentsStep.java | 4 +- .../step/PersistDuplicationsStep.java | 8 +- .../computation/step/PersistEventsStep.java | 6 +- .../step/PersistFileSourcesStep.java | 10 +- .../computation/step/PersistIssuesStep.java | 14 +- .../computation/step/PersistMeasuresStep.java | 4 +- ...ersistNumberOfDaysSinceLastCommitStep.java | 6 +- .../step/PersistProjectLinksStep.java | 6 +- .../step/PersistSnapshotsStep.java | 4 +- .../computation/step/PersistTestsStep.java | 10 +- .../computation/step/PurgeDatastoresStep.java | 6 +- .../step/QualityProfileEventsStep.java | 2 +- .../computation/step/SwitchSnapshotStep.java | 6 +- .../computation/step/ValidateProjectStep.java | 6 +- .../server/computation/ws/IsQueueEmptyWs.java | 2 +- .../server/computation/ws/QueueAction.java | 2 +- .../server/dashboard/db/DashboardDao.java | 10 +- .../sonar/server/dashboard/db/WidgetDao.java | 12 +- .../dashboard/db/WidgetPropertyDao.java | 14 +- .../template/GlobalDefaultDashboard.java | 4 +- .../template/ProjectIssuesDashboard.java | 4 +- .../sonar/server/dashboard/ws/ShowAction.java | 10 +- .../java/org/sonar/server/db/BaseDao.java | 28 +- .../org/sonar/server/db/DatabaseChecker.java | 6 +- .../java/org/sonar/server/db/DbClient.java | 48 +-- .../db/{Dao.java => DeprecatedDao.java} | 14 +- .../db/migrations/AddColumnsBuilder.java | 8 +- .../server/db/migrations/BaseDataChange.java | 2 +- .../server/db/migrations/DataChange.java | 2 +- .../db/migrations/DatabaseMigrator.java | 2 +- .../sonar/server/db/migrations/DdlChange.java | 2 +- .../db/migrations/DropColumnsBuilder.java | 10 +- .../server/db/migrations/MassUpdate.java | 2 +- .../db/migrations/MigrationStepModule.java | 2 +- .../server/db/migrations/SelectImpl.java | 2 +- .../server/db/migrations/UpsertImpl.java | 2 +- .../db/migrations/v36/Referentials.java | 2 +- .../db/migrations/v36/ViolationConverter.java | 2 +- .../migrations/v36/ViolationConverters.java | 2 +- .../v36/ViolationMigrationStep.java | 2 +- .../CompleteIssueMessageMigrationStep.java | 2 +- .../v42/PackageKeysMigrationStep.java | 2 +- ...onvertIssueDebtToMinutesMigrationStep.java | 4 +- .../DevelopmentCostMeasuresMigrationStep.java | 4 +- .../v43/IssueChangelogMigrationStep.java | 4 +- ...ssuesOnRemovedComponentsMigrationStep.java | 2 +- .../v43/RequirementMeasuresMigrationStep.java | 2 +- .../TechnicalDebtMeasuresMigrationStep.java | 4 +- .../migrations/v43/WorkDurationConvertor.java | 4 +- .../v44/ChangeLogMigrationStep.java | 10 +- .../ConvertProfileMeasuresMigrationStep.java | 10 +- .../v44/FeedQProfileDatesMigrationStep.java | 8 +- .../v44/FeedQProfileKeysMigrationStep.java | 2 +- .../v44/IssueActionPlanKeyMigrationStep.java | 2 +- .../v44/MeasureDataMigrationStep.java | 2 +- ...leParameterDefaultValuesMigrationStep.java | 2 +- ...easuresOnDeletedProfilesMigrationStep.java | 4 +- ...singCustomRuleParametersMigrationStep.java | 8 +- .../v451/DeleteUnescapedActivities.java | 2 +- .../db/migrations/v50/FeedFileSources.java | 2 +- .../db/migrations/v50/FeedIssueLongDates.java | 2 +- .../v50/FeedSnapshotSourcesUpdatedAt.java | 2 +- ...tsAuthorizationUpdatedAtMigrationStep.java | 2 +- ...ulateProjectsUuidColumnsMigrationStep.java | 8 +- ...ortFieldFromIssueFiltersMigrationStep.java | 2 +- .../ReplaceIssueFiltersProjectKeyByUuid.java | 2 +- .../db/migrations/v51/AddIssuesColumns.java | 2 +- .../migrations/v51/AddNewCharacteristics.java | 2 +- .../CopyScmAccountsFromAuthorsToUsers.java | 2 +- .../db/migrations/v51/DropIssuesColumns.java | 2 +- .../v51/FeedAnalysisReportsLongDates.java | 2 +- .../migrations/v51/FeedEventsLongDates.java | 2 +- .../v51/FeedFileSourcesBinaryData.java | 4 +- .../v51/FeedIssueChangesLongDates.java | 2 +- .../v51/FeedIssueComponentUuids.java | 2 +- .../db/migrations/v51/FeedIssueTags.java | 2 +- .../migrations/v51/FeedIssuesLongDates.java | 2 +- .../v51/FeedManualMeasuresLongDates.java | 2 +- .../v51/FeedSemaphoresLongDates.java | 2 +- .../v51/FeedSnapshotsLongDates.java | 2 +- .../db/migrations/v51/FeedUsersLongDates.java | 2 +- ...movePermissionsOnModulesMigrationStep.java | 2 +- ...eComponentRelatedParamsInIssueFilters.java | 2 +- .../v51/UpdateProjectsModuleUuidPath.java | 2 +- .../AddManualMeasuresComponentUuidColumn.java | 2 +- .../v52/FeedEventsComponentUuid.java | 2 +- .../v52/FeedFileSourcesDataType.java | 2 +- .../v52/FeedManualMeasuresComponentUuid.java | 2 +- .../migrations/v52/FeedMetricsBooleans.java | 2 +- .../v52/FeedProjectLinksComponentUuid.java | 2 +- .../v52/MoveProjectProfileAssociation.java | 2 +- .../v52/RemoveComponentLibraries.java | 2 +- .../v52/RemoveSnapshotLibraries.java | 2 +- .../sonar/server/debt/DebtModelBackup.java | 8 +- .../sonar/server/debt/DebtModelLookup.java | 4 +- .../server/debt/DebtModelOperations.java | 8 +- .../org/sonar/server/debt/DebtPredicates.java | 2 +- .../ws/DuplicationsJsonWriter.java | 4 +- .../duplication/ws/DuplicationsParser.java | 4 +- .../server/duplication/ws/ShowAction.java | 8 +- .../org/sonar/server/event/db/EventDao.java | 10 +- .../org/sonar/server/issue/ActionService.java | 7 +- .../issue/InternalRubyIssueService.java | 14 +- .../server/issue/IssueBulkChangeService.java | 9 +- .../server/issue/IssueChangelogService.java | 2 +- .../server/issue/IssueCommentService.java | 4 +- .../sonar/server/issue/IssueQueryService.java | 4 +- .../org/sonar/server/issue/IssueService.java | 7 +- .../org/sonar/server/issue}/IssueStorage.java | 17 +- .../sonar/server/issue/IssuesFinderSort.java | 2 +- .../sonar/server/issue/RulesAggregation.java | 2 +- .../server/issue/ServerIssueStorage.java | 9 +- .../ActionPlanDeadlineComparator.java | 5 +- .../issue/actionplan/ActionPlanService.java | 21 +- .../org/sonar/server/issue/db/IssueDao.java | 12 +- .../sonar/server/issue/filter/AppAction.java | 2 +- .../server/issue/filter/FavoritesAction.java | 2 +- .../issue/filter}/IssueFilterSerializer.java | 7 +- .../issue/filter/IssueFilterService.java | 11 +- .../issue/filter/IssueFilterWriter.java | 2 +- .../issue/filter/RegisterIssueFilters.java | 8 +- .../sonar/server/issue/filter/ShowAction.java | 2 +- .../index/IssueAuthorizationIndexer.java | 2 +- .../sonar/server/issue/index/IssueIndex.java | 2 +- .../server/issue/index/IssueIndexer.java | 2 +- .../notification/NewIssuesNotification.java | 4 +- .../server/issue/ws/IssueComponentHelper.java | 4 +- .../server/issue/ws/IssueJsonWriter.java | 2 +- .../sonar/server/issue/ws/SearchAction.java | 4 +- .../org/sonar/server/issue/ws/ShowAction.java | 4 +- .../server/measure/MeasureFilterContext.java | 2 +- .../server/measure/MeasureFilterExecutor.java | 6 +- .../server/measure/MeasureFilterSql.java | 8 +- .../custom/persistence/CustomMeasureDao.java | 12 +- .../measure/custom/ws/CreateAction.java | 10 +- .../custom/ws/CustomMeasureJsonWriter.java | 6 +- .../custom/ws/CustomMeasureValidator.java | 6 +- .../custom/ws/CustomMeasuresWsModule.java | 2 +- .../measure/custom/ws/DeleteAction.java | 8 +- .../measure/custom/ws/MetricsAction.java | 8 +- .../measure/custom/ws/ProjectFinder.java | 4 +- .../measure/custom/ws/SearchAction.java | 12 +- .../measure/custom/ws/UpdateAction.java | 10 +- .../measure/persistence/MeasureDao.java | 16 +- .../server/metric/DefaultMetricFinder.java | 6 +- .../server/metric/persistence/MetricDao.java | 12 +- .../sonar/server/metric/ws/CreateAction.java | 8 +- .../sonar/server/metric/ws/DeleteAction.java | 6 +- .../sonar/server/metric/ws/DomainsAction.java | 4 +- .../server/metric/ws/MetricJsonWriter.java | 2 +- .../server/metric/ws/MetricsWsModule.java | 2 +- .../sonar/server/metric/ws/SearchAction.java | 6 +- .../sonar/server/metric/ws/UpdateAction.java | 8 +- .../DefaultNotificationManager.java | 6 +- .../permission/InternalPermissionService.java | 12 +- .../InternalPermissionTemplateService.java | 12 +- .../server/permission/PermissionFinder.java | 18 +- .../permission/PermissionQueryParser.java | 4 +- .../server/permission/PermissionTemplate.java | 6 +- .../permission/PermissionTemplateUpdater.java | 10 +- .../sonar/server/platform/BackendCleanup.java | 6 +- .../platform/DatabaseServerCompatibility.java | 2 +- .../platform/DefaultServerUpgradeStatus.java | 2 +- .../server/platform/PersistentSettings.java | 4 +- .../org/sonar/server/platform/Platform.java | 2 +- .../platform/monitoring/DatabaseMonitor.java | 6 +- .../platform/platformlevel/PlatformLevel.java | 2 +- .../platformlevel/PlatformLevel1.java | 16 +- .../platformlevel/PlatformLevel4.java | 14 +- .../platform/ws/MigrateDbSystemAction.java | 4 +- .../server/platform/ws/StatusAction.java | 4 +- .../server/project/ws/BulkDeleteAction.java | 6 +- .../sonar/server/project/ws/DeleteAction.java | 6 +- .../sonar/server/project/ws/GhostsAction.java | 6 +- .../server/project/ws/ProjectsWsModule.java | 2 +- .../server/project/ws/ProvisionedAction.java | 6 +- .../properties/ProjectSettingsFactory.java | 4 +- .../qualitygate/QgateProjectFinder.java | 12 +- .../server/qualitygate/QualityGates.java | 18 +- .../qualitygate/RegisterQualityGates.java | 8 +- .../server/qualitygate/ws/CopyAction.java | 2 +- .../server/qualitygate/ws/CreateAction.java | 2 +- .../server/qualitygate/ws/ListAction.java | 2 +- .../sonar/server/qualitygate/ws/QGatesWs.java | 4 +- .../server/qualitygate/ws/RenameAction.java | 2 +- .../server/qualitygate/ws/SearchAction.java | 4 +- .../server/qualitygate/ws/ShowAction.java | 4 +- .../server/qualityprofile/ActiveRule.java | 2 +- .../qualityprofile/ActiveRuleChange.java | 2 +- .../qualityprofile/BulkChangeResult.java | 2 +- .../sonar/server/qualityprofile/QProfile.java | 2 +- .../qualityprofile/QProfileBackuper.java | 4 +- .../qualityprofile/QProfileComparison.java | 4 +- .../server/qualityprofile/QProfileCopier.java | 4 +- .../qualityprofile/QProfileExporters.java | 4 +- .../qualityprofile/QProfileFactory.java | 4 +- .../server/qualityprofile/QProfileLoader.java | 6 +- .../server/qualityprofile/QProfileLookup.java | 4 +- .../qualityprofile/QProfileProjectLookup.java | 6 +- .../QProfileProjectOperations.java | 8 +- .../server/qualityprofile/QProfileReset.java | 10 +- .../server/qualityprofile/QProfileResult.java | 2 +- .../qualityprofile/QProfileService.java | 10 +- .../qualityprofile/QProfileValidations.java | 2 +- .../RegisterQualityProfiles.java | 6 +- .../server/qualityprofile/RuleActivator.java | 14 +- .../qualityprofile/RuleActivatorContext.java | 12 +- .../RuleActivatorContextFactory.java | 12 +- .../qualityprofile/db/ActiveRuleDao.java | 16 +- .../qualityprofile/index/ActiveRuleDoc.java | 2 +- .../qualityprofile/index/ActiveRuleIndex.java | 4 +- .../index/ActiveRuleNormalizer.java | 10 +- .../qualityprofile/ws/BackupAction.java | 2 +- .../qualityprofile/ws/ChangeParentAction.java | 2 +- .../qualityprofile/ws/ChangelogAction.java | 6 +- .../qualityprofile/ws/CompareAction.java | 2 +- .../server/qualityprofile/ws/CopyAction.java | 2 +- .../qualityprofile/ws/CreateAction.java | 4 +- .../qualityprofile/ws/DeleteAction.java | 2 +- .../qualityprofile/ws/ExportAction.java | 4 +- .../qualityprofile/ws/InheritanceAction.java | 4 +- .../qualityprofile/ws/ProjectsAction.java | 4 +- .../ws/QProfileIdentificationParamUtils.java | 4 +- .../qualityprofile/ws/RestoreAction.java | 2 +- .../ws/RuleActivationActions.java | 2 +- .../qualityprofile/ws/SearchAction.java | 2 +- .../org/sonar/server/rule/RegisterRules.java | 16 +- .../org/sonar/server/rule/RuleCreator.java | 8 +- .../org/sonar/server/rule/RuleDeleter.java | 4 +- .../org/sonar/server/rule/RuleOperations.java | 8 +- .../org/sonar/server/rule/RuleTagHelper.java | 2 +- .../org/sonar/server/rule/RuleUpdater.java | 12 +- .../org/sonar/server/rule/db/RuleDao.java | 8 +- .../sonar/server/rule/index/RuleIndex.java | 2 +- .../server/rule/index/RuleNormalizer.java | 8 +- .../server/rule/ws/ActiveRuleCompleter.java | 4 +- .../org/sonar/server/rule/ws/AppAction.java | 2 +- .../sonar/server/rule/ws/SearchAction.java | 2 +- .../org/sonar/server/search/BaseIndex.java | 2 +- .../sonar/server/search/BaseNormalizer.java | 2 +- .../search/DbSynchronizationHandler.java | 2 +- .../sonar/server/search/EsSearchModule.java | 2 +- .../java/org/sonar/server/search/Index.java | 2 +- .../org/sonar/server/search/IndexQueue.java | 2 +- .../server/search/IndexSynchronizer.java | 6 +- .../server/search/action/IndexAction.java | 2 +- .../sonar/server/search/action/InsertDto.java | 2 +- .../sonar/server/search/action/UpsertDto.java | 2 +- .../sonar/server/source/db/FileSourceDao.java | 14 +- .../source/index/SourceLineIndexer.java | 2 +- .../index/SourceLineResultSetIterator.java | 2 +- .../sonar/server/source/ws/HashAction.java | 4 +- .../sonar/server/source/ws/IndexAction.java | 4 +- .../sonar/server/source/ws/LinesAction.java | 6 +- .../org/sonar/server/source/ws/RawAction.java | 4 +- .../org/sonar/server/source/ws/ScmAction.java | 4 +- .../sonar/server/source/ws/ShowAction.java | 4 +- ...equirementsFromCharacteristicsToRules.java | 12 +- .../server/startup/GeneratePluginIndex.java | 2 +- .../org/sonar/server/startup/LogServerId.java | 4 +- .../server/startup/RegisterDashboards.java | 16 +- .../server/startup/RegisterDebtModel.java | 2 +- .../sonar/server/startup/RegisterMetrics.java | 6 +- .../startup/RegisterNewMeasureFilters.java | 8 +- .../startup/RegisterPermissionTemplates.java | 12 +- .../startup/RenameDeprecatedPropertyKeys.java | 2 +- .../server/startup/RenameIssueWidgets.java | 14 +- .../sonar/server/test/CoverageService.java | 6 +- .../sonar/server/test/index/TestIndexer.java | 2 +- .../test/index/TestResultSetIterator.java | 2 +- .../server/test/ws/CoveredFilesAction.java | 6 +- .../org/sonar/server/test/ws/ListAction.java | 6 +- .../java/org/sonar/server/ui/JRubyFacade.java | 6 +- .../java/org/sonar/server/ui/ViewProxy.java | 2 +- .../ui/ws/ComponentNavigationAction.java | 14 +- .../server/ui/ws/GlobalNavigationAction.java | 4 +- .../server/user/GroupMembershipFinder.java | 10 +- .../server/user/GroupMembershipService.java | 2 +- .../sonar/server/user/RubyUserSession.java | 4 +- .../sonar/server/user/ServerUserSession.java | 6 +- .../org/sonar/server/user/UserUpdater.java | 8 +- .../org/sonar/server/user/db/GroupDao.java | 10 +- .../org/sonar/server/user/db/UserDao.java | 12 +- .../sonar/server/user/db/UserGroupDao.java | 10 +- .../sonar/server/user/index/UserIndexer.java | 2 +- .../user/index/UserResultSetIterator.java | 2 +- .../server/user/ws/DeactivateAction.java | 4 +- .../sonar/server/user/ws/GroupsAction.java | 8 +- .../sonar/server/user/ws/SearchAction.java | 4 +- .../sonar/server/user/ws/UpdateAction.java | 4 +- .../server/usergroups/ws/AddUserAction.java | 10 +- .../server/usergroups/ws/CreateAction.java | 6 +- .../server/usergroups/ws/DeleteAction.java | 6 +- .../server/usergroups/ws/GroupUpdater.java | 4 +- .../usergroups/ws/RemoveUserAction.java | 10 +- .../server/usergroups/ws/SearchAction.java | 6 +- .../server/usergroups/ws/UpdateAction.java | 6 +- .../usergroups/ws/UserGroupsModule.java | 2 +- .../server/usergroups/ws/UsersAction.java | 10 +- .../sonar/server/view/index/ViewIndexer.java | 6 +- .../dbcleaner/ProjectCleanerTest.java | 17 +- .../server/activity/ActivityServiceTest.java | 2 +- .../server/activity/db/ActivityDaoTest.java | 4 +- .../index/ActivityResultSetIteratorTest.java | 2 +- .../org/sonar/server/batch/BatchWsTest.java | 2 +- .../sonar/server/batch/GlobalActionTest.java | 8 +- .../sonar/server/batch/IssuesActionTest.java | 6 +- .../ProjectRepositoryLoaderMediumTest.java | 16 +- .../component/ComponentServiceMediumTest.java | 4 +- .../component/ComponentServiceTest.java | 10 +- .../server/component/ComponentTesting.java | 4 +- .../component/ComponentsFinderSortTest.java | 2 +- .../DefaultRubyComponentServiceTest.java | 4 +- .../server/component/SnapshotTesting.java | 4 +- .../server/component/db/ComponentDaoTest.java | 8 +- .../component/db/ComponentIndexDaoTest.java | 4 +- .../component/db/ComponentLinkDaoTest.java | 6 +- .../server/component/db/SnapshotDaoTest.java | 14 +- .../server/component/ws/AppActionTest.java | 12 +- .../server/component/ws/SearchActionTest.java | 4 +- .../computation/ComputationServiceTest.java | 4 +- .../computation/ComputationThreadTest.java | 2 +- .../server/computation/ReportQueueTest.java | 10 +- .../activity/ActivityManagerTest.java | 4 +- .../ProjectSettingsRepositoryTest.java | 10 +- .../computation/db/AnalysisReportDaoTest.java | 12 +- .../issue/IssueComputationTest.java | 2 +- .../issue/NewDebtCalculatorTest.java | 2 +- .../issue/RuleCacheLoaderTest.java | 2 +- .../issue}/UpdateConflictResolverTest.java | 14 +- .../measure/MeasureDtoToMeasureTest.java | 2 +- .../measure/MeasureRepositoryImplTest.java | 8 +- .../measure/MeasureRepositoryRule.java | 2 +- .../measure/MeasureToMeasureDtoTest.java | 2 +- .../metric/MetricDtoToMetricTest.java | 2 +- .../metric/MetricRepositoryImplTest.java | 2 +- .../QualityGateServiceImplTest.java | 8 +- .../step/ApplyPermissionsStepTest.java | 18 +- .../step/CustomMeasuresCopyStepTest.java | 4 +- .../step/FeedDebtModelStepTest.java | 6 +- .../computation/step/FeedPeriodsStepTest.java | 4 +- .../step/FillComponentsStepTest.java | 8 +- .../FillMeasuresWithVariationsStepTest.java | 14 +- .../step/IndexComponentsStepTest.java | 2 +- .../step/IndexSourceLinesStepTest.java | 2 +- .../computation/step/IndexTestsStepTest.java | 2 +- .../step/PersistComponentsStepTest.java | 6 +- .../step/PersistDuplicationsStepTest.java | 6 +- .../step/PersistEventsStepTest.java | 4 +- .../step/PersistFileSourcesStepTest.java | 8 +- .../step/PersistIssuesStepTest.java | 6 +- .../step/PersistMeasuresStepTest.java | 8 +- ...stNumberOfDaysSinceLastCommitStepTest.java | 2 +- .../step/PersistProjectLinksStepTest.java | 4 +- .../step/PersistSnapshotsStepTest.java | 10 +- .../step/PersistTestsStepTest.java | 8 +- .../step/PurgeDatastoresStepTest.java | 4 +- .../step/QualityProfileEventsStepTest.java | 2 +- .../step/ReportExtractionStepTest.java | 2 +- .../step/SwitchSnapshotStepTest.java | 2 +- .../step/ValidateProjectStepTest.java | 6 +- .../ws/HistoryActionMediumTest.java | 2 +- .../computation/ws/IsQueueEmptyWsTest.java | 2 +- .../computation/ws/QueueActionTest.java | 4 +- .../ws/SubmitReportActionTest.java | 2 +- .../server/dashboard/db/WidgetDaoTest.java | 8 +- .../template/GlobalDefaultDashboardTest.java | 4 +- .../template/ProjectIssuesDashboardTest.java | 4 +- .../java/org/sonar/server/db/BaseDaoTest.java | 6 +- .../sonar/server/db/DatabaseCheckerTest.java | 10 +- .../org/sonar/server/db/DbClientTest.java | 8 +- .../server/db/ResultSetIteratorTest.java | 2 +- .../org/sonar/server/db/fake/FakeDao.java | 2 +- .../org/sonar/server/db/fake/FakeDto.java | 2 +- .../db/migrations/AddColumnsBuilderTest.java | 10 +- .../db/migrations/BaseDataChangeTest.java | 6 +- .../db/migrations/DatabaseMigratorTest.java | 10 +- .../db/migrations/DropColumnsBuilderTest.java | 6 +- .../v36/ViolationMigrationTest.java | 2 +- .../CompleteIssueMessageMigrationTest.java | 2 +- .../v42/PackageKeysMigrationTest.java | 2 +- ...rtIssueDebtToMinutesMigrationStepTest.java | 6 +- ...elopmentCostMeasuresMigrationStepTest.java | 6 +- .../v43/IssueChangelogMigrationStepTest.java | 6 +- ...sOnRemovedComponentsMigrationStepTest.java | 2 +- .../RequirementMeasuresMigrationStepTest.java | 2 +- ...echnicalDebtMeasuresMigrationStepTest.java | 6 +- .../v43/WorkDurationConvertorTest.java | 4 +- .../v44/ChangeLogMigrationTest.java | 4 +- .../ConvertProfileMeasuresMigrationTest.java | 2 +- .../v44/FeedQProfileDatesMigrationTest.java | 4 +- .../v44/FeedQProfileKeysMigrationTest.java | 2 +- .../v44/IssueActionPlanKeyMigrationTest.java | 2 +- .../v44/MeasureDataMigrationTest.java | 2 +- ...leParameterDefaultValuesMigrationTest.java | 2 +- ...easuresOnDeletedProfilesMigrationTest.java | 2 +- ...singCustomRuleParametersMigrationTest.java | 2 +- .../v451/DeleteUnescapedActivitiesTest.java | 2 +- .../migrations/v50/FeedFileSourcesTest.java | 2 +- .../v50/FeedIssueLongDatesTest.java | 2 +- ...tsAuthorizationUpdatedAtMigrationTest.java | 2 +- ...ulateProjectsUuidColumnsMigrationTest.java | 8 +- ...ortFieldFromIssueFiltersMigrationTest.java | 2 +- ...placeIssueFiltersProjectKeyByUuidTest.java | 2 +- .../migrations/v51/AddIssuesColumnsTest.java | 2 +- .../v51/AddNewCharacteristicsTest.java | 2 +- ...CopyScmAccountsFromAuthorsToUsersTest.java | 4 +- .../migrations/v51/DropIssuesColumnsTest.java | 4 +- .../v51/FeedAnalysisReportsLongDatesTest.java | 2 +- .../v51/FeedEventsLongDatesTest.java | 2 +- .../v51/FeedFileSourcesBinaryDataTest.java | 4 +- .../v51/FeedIssueChangesLongDatesTest.java | 2 +- .../v51/FeedIssueComponentUuidsTest.java | 2 +- .../db/migrations/v51/FeedIssueTagsTest.java | 2 +- .../v51/FeedIssuesLongDatesTest.java | 2 +- .../v51/FeedManualMeasuresLongDatesTest.java | 2 +- .../v51/FeedSemaphoresLongDatesTest.java | 2 +- .../v51/FeedSnapshotsLongDatesTest.java | 2 +- .../v51/FeedUsersLongDatesTest.java | 2 +- ...movePermissionsOnModulesMigrationTest.java | 2 +- ...atedParamsInIssueFiltersMigrationTest.java | 2 +- .../v51/UpdateProjectsModuleUuidPathTest.java | 2 +- ...ManualMeasuresComponentUuidColumnTest.java | 2 +- .../v52/FeedEventsComponentUuidTest.java | 2 +- .../v52/FeedFileSourcesDataTypeTest.java | 2 +- .../FeedManualMeasuresComponentUuidTest.java | 2 +- .../v52/FeedMetricsBooleansTest.java | 2 +- .../FeedProjectLinksComponentUuidTest.java | 2 +- .../MoveProjectProfileAssociationTest.java | 2 +- .../v52/RemoveComponentLibrariesTest.java | 2 +- .../v52/RemoveSnapshotLibrariesTest.java | 2 +- .../server/debt/DebtModelBackupTest.java | 8 +- .../server/debt/DebtModelLookupTest.java | 4 +- .../server/debt/DebtModelOperationsTest.java | 8 +- .../org/sonar/server/debt/DebtTesting.java | 2 +- .../ws/DuplicationsJsonWriterTest.java | 4 +- .../ws/DuplicationsParserTest.java | 4 +- .../server/duplication/ws/ShowActionTest.java | 6 +- .../sonar/server/event/db/EventDaoTest.java | 6 +- .../sonar/server/issue/ActionServiceTest.java | 11 +- .../issue/InternalRubyIssueServiceTest.java | 10 +- .../IssueBulkChangeServiceMediumTest.java | 12 +- .../issue/IssueChangelogServiceTest.java | 2 +- .../issue/IssueCommentServiceMediumTest.java | 10 +- .../server/issue/IssueCommentServiceTest.java | 8 +- .../server/issue/IssueQueryServiceTest.java | 6 +- .../server/issue/IssueServiceMediumTest.java | 14 +- .../sonar/server/issue}/IssueStorageTest.java | 23 +- .../org/sonar/server/issue/IssueTesting.java | 6 +- .../server/issue/IssuesFinderSortTest.java | 2 +- .../server/issue/RulesAggregationTest.java | 2 +- .../server/issue/ServerIssueStorageTest.java | 6 +- .../ActionPlanDeadlineComparatorTest.java | 10 +- .../actionplan/ActionPlanServiceTest.java | 20 +- .../sonar/server/issue/db/IssueDaoTest.java | 8 +- .../server/issue/filter/AppActionTest.java | 2 +- .../issue/filter/FavoritesActionTest.java | 2 +- .../filter}/IssueFilterSerializerTest.java | 6 +- .../issue/filter/IssueFilterServiceTest.java | 11 +- .../issue/filter/IssueFilterWriterTest.java | 2 +- .../filter/RegisterIssueFiltersTest.java | 6 +- .../server/issue/filter/ShowActionTest.java | 2 +- .../index/IssueAuthorizationDaoTest.java | 2 +- .../index/IssueAuthorizationIndexerTest.java | 2 +- .../issue/index/IssueIndexDebtTest.java | 2 +- .../server/issue/index/IssueIndexTest.java | 2 +- .../server/issue/index/IssueIndexerTest.java | 2 +- .../index/IssueResultSetIteratorTest.java | 2 +- .../IssueChangeNotificationTest.java | 2 +- .../NewIssuesNotificationTest.java | 2 +- .../ws/SearchActionComponentsMediumTest.java | 8 +- .../issue/ws/SearchActionMediumTest.java | 18 +- .../sonar/server/issue/ws/ShowActionTest.java | 4 +- .../measure/MeasureFilterExecutorTest.java | 6 +- .../persistence/CustomMeasureDaoTest.java | 6 +- .../persistence/CustomMeasureTesting.java | 2 +- .../measure/custom/ws/CreateActionTest.java | 10 +- .../custom/ws/CustomMeasureValidatorTest.java | 2 +- .../measure/custom/ws/DeleteActionTest.java | 8 +- .../measure/custom/ws/MetricsActionTest.java | 10 +- .../measure/custom/ws/SearchActionTest.java | 10 +- .../measure/custom/ws/UpdateActionTest.java | 10 +- .../measure/persistence/MeasureDaoTest.java | 8 +- .../metric/DefaultMetricFinderTest.java | 2 +- .../metric/persistence/MetricDaoTest.java | 6 +- .../server/metric/ws/CreateActionTest.java | 6 +- .../server/metric/ws/DeleteActionTest.java | 8 +- .../server/metric/ws/DomainsActionTest.java | 6 +- .../sonar/server/metric/ws/MetricTesting.java | 2 +- .../server/metric/ws/SearchActionTest.java | 6 +- .../server/metric/ws/UpdateActionTest.java | 6 +- .../DefaultNotificationManagerTest.java | 6 +- .../notification/NotificationServiceTest.java | 2 +- .../InternalPermissionServiceMediumTest.java | 10 +- ...InternalPermissionTemplateServiceTest.java | 22 +- .../permission/PermissionFinderTest.java | 18 +- .../permission/PermissionQueryParserTest.java | 2 +- .../permission/PermissionQueryTest.java | 2 +- .../permission/PermissionTemplateTest.java | 6 +- .../PermissionTemplateUpdaterTest.java | 10 +- .../platform/BackendCleanupMediumTest.java | 2 +- .../DatabaseServerCompatibilityTest.java | 2 +- .../DefaultServerUpgradeStatusTest.java | 2 +- .../platform/PersistentSettingsTest.java | 4 +- .../monitoring/DatabaseMonitorTest.java | 4 +- .../ws/MigrateDbSystemActionTest.java | 6 +- .../server/platform/ws/StatusActionTest.java | 4 +- .../project/ws/BulkDeleteActionTest.java | 18 +- .../server/project/ws/DeleteActionTest.java | 18 +- .../server/project/ws/GhostsActionTest.java | 8 +- .../project/ws/ProvisionedActionTest.java | 8 +- ...ProjectSettingsRespositoryFactoryTest.java | 4 +- .../server/qualitygate/QualityGatesTest.java | 18 +- .../qualitygate/RegisterQualityGatesTest.java | 6 +- .../server/qualitygate/ws/QGatesWsTest.java | 8 +- .../ActiveRuleBackendMediumTest.java | 12 +- .../QProfileBackuperMediumTest.java | 8 +- .../QProfileComparisonMediumTest.java | 8 +- .../QProfileCopierMediumTest.java | 10 +- .../qualityprofile/QProfileExportersTest.java | 4 +- .../QProfileFactoryMediumTest.java | 10 +- .../QProfileProjectOperationsMediumTest.java | 10 +- .../QProfileResetMediumTest.java | 8 +- .../QProfileServiceMediumTest.java | 10 +- .../qualityprofile/QProfileTesting.java | 2 +- .../RegisterQualityProfilesMediumTest.java | 14 +- .../RuleActivatorMediumTest.java | 14 +- .../qualityprofile/ws/BackupActionTest.java | 2 +- .../ws/ChangeParentActionMediumTest.java | 8 +- .../ws/ChangelogActionTest.java | 12 +- .../ws/CompareActionMediumTest.java | 12 +- .../qualityprofile/ws/CopyActionTest.java | 2 +- .../ws/CreateActionMediumTest.java | 2 +- .../qualityprofile/ws/CreateActionTest.java | 4 +- .../qualityprofile/ws/DeleteActionTest.java | 10 +- .../qualityprofile/ws/ExportActionTest.java | 8 +- .../ws/InheritanceActionMediumTest.java | 8 +- .../qualityprofile/ws/ProjectsActionTest.java | 20 +- .../ws/QProfilesWsMediumTest.java | 12 +- .../qualityprofile/ws/RenameActionTest.java | 8 +- .../qualityprofile/ws/RestoreActionTest.java | 2 +- .../qualityprofile/ws/SearchActionTest.java | 8 +- .../ws/SetDefaultActionTest.java | 8 +- .../rule/DefaultRuleFinderMediumTest.java | 4 +- .../server/rule/RegisterRulesMediumTest.java | 8 +- .../sonar/server/rule/RegisterRulesTest.java | 12 +- .../server/rule/RuleBackendMediumTest.java | 8 +- .../server/rule/RuleCreatorMediumTest.java | 8 +- .../server/rule/RuleDeleterMediumTest.java | 6 +- .../sonar/server/rule/RuleOperationsTest.java | 8 +- .../server/rule/RuleServiceMediumTest.java | 4 +- .../sonar/server/rule/RuleTagHelperTest.java | 2 +- .../org/sonar/server/rule/RuleTesting.java | 4 +- .../server/rule/RuleUpdaterMediumTest.java | 12 +- .../org/sonar/server/rule/db/RuleDaoTest.java | 10 +- .../rule/index/RuleIndexMediumTest.java | 12 +- .../sonar/server/rule/ws/AppActionTest.java | 2 +- .../rule/ws/CreateActionMediumTest.java | 6 +- .../server/rule/ws/RulesWsMediumTest.java | 18 +- .../server/rule/ws/ShowActionMediumTest.java | 12 +- .../rule/ws/UpdateActionMediumTest.java | 6 +- .../server/source/db/FileSourceDaoTest.java | 8 +- .../server/source/db/FileSourceTesting.java | 2 +- .../source/index/SourceLineIndexerTest.java | 2 +- .../SourceLineResultSetIteratorTest.java | 2 +- .../server/source/ws/HashActionTest.java | 4 +- .../server/source/ws/IndexActionTest.java | 4 +- .../server/source/ws/LinesActionTest.java | 6 +- .../sonar/server/source/ws/RawActionTest.java | 4 +- .../sonar/server/source/ws/ScmActionTest.java | 6 +- .../server/source/ws/ShowActionTest.java | 4 +- .../server/startup/ActivityServerIdTest.java | 4 +- ...rementsFromCharacteristicsToRulesTest.java | 6 +- .../startup/RegisterDashboardsTest.java | 11 +- .../server/startup/RegisterDebtModelTest.java | 4 +- .../server/startup/RegisterMetricsTest.java | 4 +- .../RegisterNewMeasureFiltersTest.java | 8 +- .../RegisterPermissionTemplatesTest.java | 12 +- .../RenameDeprecatedPropertyKeysTest.java | 2 +- .../startup/RenameIssueWidgetsTest.java | 6 +- .../server/test/CoverageServiceTest.java | 4 +- .../org/sonar/server/test/db/TestTesting.java | 2 +- .../server/test/index/TestIndexerTest.java | 2 +- .../test/index/TestResultSetIteratorTest.java | 2 +- .../test/ws/CoveredFilesActionTest.java | 2 +- .../sonar/server/test/ws/ListActionTest.java | 6 +- .../ui/ws/ComponentNavigationActionTest.java | 20 +- .../ui/ws/GlobalNavigationActionTest.java | 14 +- .../user/GroupMembershipFinderTest.java | 10 +- .../user/GroupMembershipServiceTest.java | 6 +- .../server/user/ServerUserSessionTest.java | 8 +- .../sonar/server/user/UserUpdaterTest.java | 12 +- .../sonar/server/user/db/GroupDaoTest.java | 6 +- .../org/sonar/server/user/db/UserDaoTest.java | 6 +- .../server/user/db/UserGroupDaoTest.java | 6 +- .../server/user/index/UserIndexerTest.java | 2 +- .../user/index/UserResultSetIteratorTest.java | 2 +- .../user/ws/ChangePasswordActionTest.java | 6 +- .../server/user/ws/CreateActionTest.java | 8 +- .../server/user/ws/DeactivateActionTest.java | 8 +- .../server/user/ws/GroupsActionTest.java | 12 +- .../server/user/ws/SearchActionTest.java | 12 +- .../server/user/ws/UpdateActionTest.java | 10 +- .../usergroups/ws/AddUserActionTest.java | 12 +- .../usergroups/ws/CreateActionTest.java | 6 +- .../usergroups/ws/DeleteActionTest.java | 14 +- .../usergroups/ws/RemoveUserActionTest.java | 12 +- .../usergroups/ws/SearchActionTest.java | 10 +- .../usergroups/ws/UpdateActionTest.java | 10 +- .../server/usergroups/ws/UsersActionTest.java | 12 +- .../server/view/index/ViewIndexerTest.java | 14 +- .../should_insert_new_issues-result.xml | 2 +- ...ld_resolve_conflicts_on_updates-result.xml | 2 +- .../should_resolve_conflicts_on_updates.xml | 2 +- .../should_update_issues-result.xml | 2 +- .../IssueStorageTest/should_update_issues.xml | 2 +- .../main/webapp/WEB-INF/db/migrate/README.txt | 4 +- .../lib/arjdbc/postgresql/adapter.rb | 2 +- sonar-batch/pom.xml | 19 - .../batch/bootstrap/BatchComponents.java | 2 +- .../batch/bootstrap/BatchPluginInstaller.java | 4 +- .../batch/cpd/index/DbDuplicationsIndex.java | 106 ----- .../cpd/index/SonarDuplicationsIndex.java | 28 +- .../issue/tracking/ServerIssueFromDb.java | 62 --- .../org/sonar/batch/rule/UsedQProfiles.java | 2 +- .../batch/scan/ProjectScanContainer.java | 5 +- .../org/sonar/batch/bootstrapper/logback.xml | 2 +- .../resources/org/sonar/batch/logback.xml | 2 +- .../sonar/batch/ProjectConfiguratorTest.java | 3 +- .../bootstrap/BatchPluginInstallerTest.java | 2 +- .../issue/tracking/IssueTrackingTest.java | 391 ------------------ .../batch/report/ReportPublisherTest.java | 6 +- .../sonar/batch/rule/QProfileSensorTest.java | 2 +- .../sonar/batch/rule/UsedQProfilesTest.java | 2 +- sonar-core/pom.xml | 81 +--- .../sonar/core/component/ComponentKeys.java | 6 +- .../DefaultResourceTypes.java | 2 +- .../sonar/core/component/db/package-info.java | 23 -- .../sonar/core/component/package-info.java | 1 + .../core/computation/db/package-info.java | 24 -- .../computation/dbcleaner/package-info.java | 24 -- .../dbcleaner/period/package-info.java | 24 -- .../core/config/CorePropertyDefinitions.java | 127 +++--- .../org/sonar/core/config/DebtProperties.java | 5 +- .../core/config/ExclusionProperties.java | 3 +- .../core/config/IssueExclusionProperties.java | 5 +- .../java/org/sonar/core/config/Logback.java | 15 +- .../PurgeConstants.java} | 4 +- .../PurgeProperties.java} | 23 +- .../sonar/core/config/SecurityProperties.java | 3 +- .../org/sonar/core/config/package-info.java | 1 + .../sonar/core/dashboard/package-info.java | 23 -- .../sonar/core/duplication/package-info.java | 23 -- .../org/sonar/core/i18n/DurationLabel.java | 9 +- .../org/sonar/core/i18n/I18nClassloader.java | 7 +- .../org/sonar/core/i18n/RuleI18nManager.java | 8 +- .../org/sonar/core/i18n/package-info.java | 1 + .../sonar/core/issue/DefaultActionPlan.java | 9 +- .../sonar/core/issue/DefaultIssueBuilder.java | 6 +- .../sonar/core/issue/DefaultIssueComment.java | 10 +- .../java/org/sonar/core/issue/FieldDiffs.java | 10 +- .../sonar/core/issue/IssueChangeContext.java | 5 +- .../org/sonar/core/issue/IssueUpdater.java | 14 +- .../org/sonar/core/issue/tracking/Input.java | 2 + .../core/issue/tracking/package-info.java | 1 + .../sonar/core/issue/workflow/Function.java | 7 +- .../core/issue/workflow/FunctionExecutor.java | 9 +- .../org/sonar/core/issue/workflow/State.java | 7 +- .../sonar/core/issue/workflow/Transition.java | 5 +- .../core/issue/workflow/package-info.java | 1 + .../core/measure/custom/db/package-info.java | 25 -- .../core/notification/db/package-info.java | 23 -- .../sonar/core/notification/package-info.java | 23 -- .../persistence/dialect/package-info.java | 23 -- .../migration/v44/package-info.java | 24 -- .../migration/v45/package-info.java | 23 -- .../migration/v50/package-info.java | 24 -- .../persistence/profiling/package-info.java | 24 -- .../sonar/core/platform/ComponentKeys.java | 7 +- .../core/{component => platform}/Module.java | 3 +- .../org/sonar/core/platform/PluginInfo.java | 16 +- .../core/platform/PluginJarExploder.java | 3 +- .../sonar/core/platform/PluginRepository.java | 5 +- .../{plugins => platform}/RemotePlugin.java | 3 +- .../RemotePluginFile.java | 3 +- .../org/sonar/core/platform/package-info.java | 1 + .../core/qualitygate/db/package-info.java | 23 -- .../core/qualityprofile/db/package-info.java | 23 -- .../core/qualityprofile/package-info.java | 23 -- .../org/sonar/core/resource/package-info.java | 23 -- .../core/{event => rule}/package-info.java | 4 +- .../sonar/core/source/db/package-info.java | 24 -- .../core/technicaldebt/db/package-info.java | 24 -- .../core/technicaldebt/package-info.java | 23 -- .../java/org/sonar/core/user/DefaultUser.java | 5 +- .../core/util/DefaultHttpDownloader.java | 20 +- .../java/org/sonar/core/util/MultiSets.java | 1 - .../sonar/core/util/NonNullInputFunction.java | 3 +- .../sonar/core/{ => util}/UtcDateUtils.java | 5 +- .../org/sonar/core/util/package-info.java | 1 + .../DefaultResourceTypesTest.java | 2 +- .../config/CorePropertyDefinitionsTest.java | 3 +- .../PurgePropertiesTest.java} | 6 +- .../sonar/core/i18n/DurationLabelTest.java | 2 +- .../sonar/core/i18n/I18nClassloaderTest.java | 5 +- .../sonar/core/i18n/RuleI18nManagerTest.java | 13 +- .../sonar/core/issue/DefaultIssueTest.java | 5 +- .../core/issue/IssueChangeContextTest.java | 3 +- .../sonar/core/issue/IssueUpdaterTest.java | 11 +- .../issue/workflow/IsBeingClosedTest.java | 1 - .../issue/workflow/IssueWorkflowTest.java | 97 +++-- .../sonar/core/issue/workflow/StateTest.java | 2 +- .../core/platform/ComponentContainerTest.java | 3 +- .../{component => platform}/ModuleTest.java | 5 +- .../sonar/core/platform/PicoUtilsTest.java | 3 +- .../sonar/core/platform/PluginInfoTest.java | 13 +- .../core/platform/PluginJarExploderTest.java | 5 +- .../sonar/core/platform/PluginLoaderTest.java | 6 - .../RemotePluginTest.java | 2 +- .../core/util/DefaultHttpDownloaderTest.java | 29 +- .../org/sonar/core/util/HttpsTrustTest.java | 7 +- .../org/sonar/core/util/MultiSetsTest.java | 3 +- .../core/util/NonNullInputFunctionTest.java | 2 +- .../core/{ => util}/UtcDateUtilsTest.java | 5 +- .../org/sonar/plugins/base/BasePlugin.java | 3 +- .../plugins/dependent/DependentPlugin.java | 4 +- .../shouldGetMaxOrderIndexForNullUser.xml | 21 - .../shouldInsert-result.xml | 9 - .../shouldInsertWithNoUser-result.xml | 9 - .../issue/db/ActionPlanDaoTest/shared.xml | 5 - .../db/ActionPlanStatsDaoTest/shared.xml | 5 - .../should_find_by_project.xml | 81 ---- ...tChangelogOfNonClosedIssuesByComponent.xml | 182 -------- .../issue/db/IssueChangeDaoTest/shared.xml | 63 --- .../db/IssueChangeDaoTest/update-result.xml | 38 -- .../insert_comment-result.xml | 13 - .../insert_diff-result.xml | 13 - .../find_severities_by_component.xml | 80 ---- .../core/issue/db/IssueDaoTest/shared.xml | 18 - .../should_select_issue_and_component_ids.xml | 80 ---- ...uld_select_non_closed_issues_by_module.xml | 133 ------ ...ed_issues_by_module_on_removed_project.xml | 127 ------ .../issue/db/IssueFilterDaoTest/shared.xml | 23 -- .../should_delete-result.xml | 13 - .../should_insert-result.xml | 34 -- .../should_select_by_user.xml | 33 -- ...ect_by_user_with_only_favorite_filters.xml | 39 -- .../should_select_provided_by_name.xml | 58 --- .../should_update-result.xml | 23 -- .../db/IssueFilterFavouriteDaoTest/shared.xml | 21 - .../should_delete-result.xml | 15 - ...hould_delete_by_issue_filter_id-result.xml | 9 - .../should_insert-result.xml | 27 -- .../db/IssueMapperTest/testInsert-result.xml | 29 -- .../db/IssueMapperTest/testUpdate-result.xml | 29 -- .../issue/db/IssueMapperTest/testUpdate.xml | 27 -- ...eforeSelectedDate_with_conflict-result.xml | 30 -- ...updateBeforeSelectedDate_with_conflict.xml | 28 -- .../should_select_assignees.xml | 80 ---- .../metric/CacheMetricFinderTest/shared.xml | 12 - ...reateNonAsciiPermissionTemplate-result.xml | 3 - .../createPermissionTemplate-result.xml | 3 - .../deletePermissionTemplate-result.xml | 7 - .../selectAllPermissionTemplates.xml | 5 - .../selectEmptyPermissionTemplate.xml | 9 - .../updatePermissionTemplate-result.xml | 4 - .../updatePermissionTemplate.xml | 4 - .../multi-modules-with-issues.xml | 124 ------ .../should_copy_permission_templates.xml | 9 - .../should_create_database.xml | 33 -- .../should_create_database_with_issues.xml | 72 ---- .../SemaphoreDaoTest/old_semaphore.xml | 3 - .../sonar-checkstyle-plugin-2.8.jar | Bin .../findNotificationSubscribers.xml | 55 --- .../delete-result.xml | 8 - .../selectForQualityGate.xml | 9 - .../shouldCleanConditions.xml | 19 - .../update-result.xml | 9 - .../db/QualityGateDaoTest/delete-result.xml | 6 - .../db/QualityGateDaoTest/insert-result.xml | 5 - .../db/QualityGateDaoTest/selectAll.xml | 7 - .../db/QualityGateDaoTest/update-result.xml | 7 - .../DefaultModelFinderTest/shared.xml | 10 - .../db/ActiveRuleDaoTest/update-result.xml | 9 - .../grantGroupRole.xml | 4 - .../grantGroupRole_anyone-result.xml | 6 - .../grantGroupRole_anyone.xml | 4 - .../core/resource/ResourceDaoTest/fixture.xml | 84 ---- .../get_last_snapshot_by_component_uuid.xml | 80 ---- .../sonar/core/rule/RuleDaoTest/selectAll.xml | 13 - .../core/rule/RuleDaoTest/selectById.xml | 6 - .../core/rule/RuleDaoTest/selectNonManual.xml | 6 - .../rule/RuleDaoTest/selectParameters.xml | 6 - .../core/rule/RuleDaoTest/select_by_name.xml | 6 - .../rule/RuleDaoTest/select_by_rule_key.xml | 6 - .../select_parameters_by_rule_id.xml | 8 - .../select_parameters_by_rule_ids.xml | 7 - .../core/rule/RuleDaoTest/update-result.xml | 21 - .../sonar/core/rule/RuleDaoTest/update.xml | 12 - .../RuleDaoTest/update_parameter-result.xml | 3 - ...re_requirement_on_root_characteristics.xml | 19 - .../import_characteristics.xml | 22 - .../shouldImportXML_badly-formatted.xml | 43 -- ...tXML_with_deprecated_constant_per_file.xml | 25 -- ..._with_deprecated_linear_with_threshold.xml | 36 -- .../shouldImportXML_with_linear.xml | 29 -- ...houldImportXML_with_linear_with_offset.xml | 34 -- .../shouldLogWarningIfRuleNotFound.xml | 23 -- .../shouldRejectXML_with_invalid_value.xml | 28 -- .../use_default_unit_when_no_unit.xml | 52 --- .../shouldInsert-result.xml | 8 - .../AuthorDaoTest/countDeveloperLogins.xml | 7 - .../shouldInsertAuthorAndDeveloper-result.xml | 4 - ...AuthorsAndDevelopersDuplication-result.xml | 7 - ...PreventAuthorsAndDevelopersDuplication.xml | 7 - ...shouldPreventAuthorsDuplication-result.xml | 5 - .../shouldPreventAuthorsDuplication.xml | 5 - .../UserDaoTest/selectActiveUserByLogin.xml | 11 - .../user/UserDaoTest/selectUsersByLogins.xml | 6 - .../user/UserDaoTest/selectUsersByQuery.xml | 5 - .../user/UserDaoTest/selectUsersByText.xml | 5 - sonar-db/pom.xml | 135 ++++++ .../org/sonar/batch/index/ResourceCopy.java | 0 .../org/sonar/core/issue/ActionPlanStats.java | 7 +- .../org/sonar/core/issue/db/package-info.java | 1 + .../org/sonar/core/issue/package-info.java | 1 + .../core/permission/ComponentPermissions.java | 3 +- .../core/permission/GlobalPermissions.java | 1 - .../core/permission/GroupWithPermission.java | 5 +- .../core/permission/UserWithPermission.java | 0 .../sonar/core/permission/package-info.java | 1 + .../org/sonar/core/timemachine/Periods.java | 0 .../sonar/core/timemachine}/package-info.java | 4 +- .../sonar/core/user/DefaultUserFinder.java | 9 +- .../sonar/core/user/DeprecatedUserFinder.java | 2 + .../org/sonar/core/user/GroupMembership.java | 5 +- .../org/sonar/core/user/package-info.java | 0 .../main/java/org/sonar/db}/BatchSession.java | 11 +- .../src/main/java/org/sonar/db/Dao.java | 4 +- .../src/main/java/org/sonar/db}/DaoUtils.java | 59 +-- .../src/main/java/org/sonar/db}/Database.java | 4 +- .../java/org/sonar/db}/DatabaseUtils.java | 8 +- .../main/java/org/sonar/db}/DbSession.java | 15 +- .../src/main/java/org/sonar/db}/DdlUtils.java | 11 +- .../java/org/sonar/db}/DefaultDatabase.java | 8 +- .../src/main/java/org/sonar/db}/Dto.java | 2 +- .../java/org/sonar/db}/IsAliveMapper.java | 3 +- .../src/main/java/org/sonar/db}/MyBatis.java | 221 +++++----- .../org/sonar/db/activity}/ActivityDto.java | 8 +- .../sonar/db/activity}/ActivityMapper.java | 2 +- .../org/sonar/db/activity}/package-info.java | 3 +- .../org/sonar/db}/component/ComponentDto.java | 10 +- .../db/component}/ComponentIndexMapper.java | 5 +- .../sonar/db}/component/ComponentLinkDto.java | 3 +- .../db/component}/ComponentLinkMapper.java | 4 +- .../sonar/db/component}/ComponentMapper.java | 5 +- .../db}/component/FilePathWithHashDto.java | 2 +- .../org/sonar/db/component}/ResourceDao.java | 12 +- .../org/sonar/db/component}/ResourceDto.java | 2 +- .../sonar/db/component}/ResourceIndexDto.java | 2 +- .../db/component}/ResourceIndexerDao.java | 10 +- .../db/component}/ResourceIndexerMapper.java | 2 +- .../db/component}/ResourceIndexerQuery.java | 4 +- .../db/component}/ResourceKeyUpdaterDao.java | 6 +- .../component}/ResourceKeyUpdaterMapper.java | 2 +- .../sonar/db/component}/ResourceMapper.java | 8 +- .../sonar/db/component}/ResourceQuery.java | 2 +- .../org/sonar/db}/component/SnapshotDto.java | 2 +- .../sonar/db/component}/SnapshotMapper.java | 3 +- .../sonar/db/component}/SnapshotQuery.java | 4 +- .../db}/component/UuidWithProjectUuidDto.java | 2 +- .../org/sonar/db/component}/package-info.java | 4 +- .../sonar/db/compute}/AnalysisReportDto.java | 3 +- .../db/compute}/AnalysisReportMapper.java | 5 +- .../org/sonar/db/compute/package-info.java | 25 ++ .../db}/dashboard/ActiveDashboardDao.java | 8 +- .../db}/dashboard/ActiveDashboardDto.java | 2 +- .../db}/dashboard/ActiveDashboardMapper.java | 9 +- .../org/sonar/db}/dashboard/DashboardDao.java | 12 +- .../org/sonar/db}/dashboard/DashboardDto.java | 5 +- .../sonar/db}/dashboard/DashboardMapper.java | 5 +- .../org/sonar/db}/dashboard/WidgetDto.java | 3 +- .../org/sonar/db}/dashboard/WidgetMapper.java | 5 +- .../db}/dashboard/WidgetPropertyDto.java | 3 +- .../db}/dashboard/WidgetPropertyMapper.java | 10 +- .../org/sonar/db/dashboard/package-info.java | 24 ++ .../org/sonar/db/debt}/CharacteristicDao.java | 14 +- .../org/sonar/db/debt}/CharacteristicDto.java | 10 +- .../sonar/db/debt}/CharacteristicMapper.java | 5 +- .../db/debt}/RequirementMigrationDto.java | 7 +- .../java/org/sonar/db/debt}/package-info.java | 2 +- .../sonar/db/deprecated}/ClusterAction.java | 2 +- .../org/sonar/db/deprecated}/NullQueue.java | 2 +- .../org/sonar/db/deprecated}/WorkQueue.java | 2 +- .../sonar/db}/dialect/AbstractDialect.java | 4 +- .../java/org/sonar/db}/dialect/Dialect.java | 2 +- .../org/sonar/db}/dialect/DialectUtils.java | 10 +- .../main/java/org/sonar/db}/dialect/H2.java | 2 +- .../java/org/sonar/db}/dialect/MsSql.java | 2 +- .../java/org/sonar/db}/dialect/MySql.java | 2 +- .../java/org/sonar/db}/dialect/Oracle.java | 2 +- .../org/sonar/db}/dialect/PostgreSql.java | 2 +- .../org/sonar/db/dialect/package-info.java | 24 ++ .../sonar/db}/duplication/DuplicationDao.java | 13 +- .../db}/duplication/DuplicationMapper.java | 12 +- .../db}/duplication/DuplicationUnitDto.java | 3 +- .../sonar/db/duplication/package-info.java | 24 ++ .../java/org/sonar/db}/event/EventDto.java | 2 +- .../java/org/sonar/db/event}/EventMapper.java | 9 +- .../java/org/sonar/db/event/package-info.java | 25 ++ .../org/sonar/db/issue}/ActionPlanDao.java | 8 +- .../org/sonar/db/issue}/ActionPlanDto.java | 26 +- .../org/sonar/db/issue}/ActionPlanMapper.java | 5 +- .../sonar/db/issue}/ActionPlanStatsDao.java | 14 +- .../sonar/db/issue}/ActionPlanStatsDto.java | 25 +- .../db/issue}/ActionPlanStatsMapper.java | 5 +- .../org/sonar/db/issue}/IssueChangeDao.java | 10 +- .../org/sonar/db/issue}/IssueChangeDto.java | 14 +- .../sonar/db/issue}/IssueChangeMapper.java | 2 +- .../java/org/sonar/db/issue}/IssueDao.java | 15 +- .../java/org/sonar/db/issue}/IssueDto.java | 40 +- .../org/sonar/db/issue}/IssueFilterDao.java | 21 +- .../org/sonar/db/issue}/IssueFilterDto.java | 5 +- .../db/issue}/IssueFilterFavouriteDao.java | 14 +- .../db/issue}/IssueFilterFavouriteDto.java | 2 +- .../db/issue}/IssueFilterFavouriteMapper.java | 8 +- .../sonar/db/issue}/IssueFilterMapper.java | 5 +- .../java/org/sonar/db/issue}/IssueMapper.java | 2 +- .../java/org/sonar/db/issue/package-info.java | 24 ++ .../db/loadedtemplate}/LoadedTemplateDao.java | 14 +- .../db/loadedtemplate}/LoadedTemplateDto.java | 2 +- .../loadedtemplate}/LoadedTemplateMapper.java | 2 +- .../sonar/db/loadedtemplate/package-info.java | 24 ++ .../sonar/db/measure}/CustomMeasureDto.java | 2 +- .../db/measure}/CustomMeasureMapper.java | 2 +- .../org/sonar/db/measure}/MeasureDto.java | 2 +- .../sonar/db/measure}/MeasureFilterDao.java | 11 +- .../sonar/db/measure}/MeasureFilterDto.java | 5 +- .../db/measure}/MeasureFilterMapper.java | 2 +- .../org/sonar/db/measure}/MeasureMapper.java | 2 +- .../org/sonar/db/measure}/PastMeasureDto.java | 2 +- .../org/sonar/db/measure/package-info.java | 24 ++ .../java/org/sonar/db/metric}/MetricDto.java | 2 +- .../org/sonar/db/metric}/MetricMapper.java | 2 +- .../org/sonar/db/metric/package-info.java | 24 ++ .../notification}/NotificationQueueDao.java | 16 +- .../notification}/NotificationQueueDto.java | 13 +- .../NotificationQueueMapper.java | 2 +- .../sonar/db/notification/package-info.java | 24 ++ .../main/java/org/sonar/db/package-info.java | 24 ++ .../permission/GroupWithPermissionDto.java | 3 +- .../sonar/db}/permission/PermissionDao.java | 14 +- .../db}/permission/PermissionFacade.java | 20 +- .../db}/permission/PermissionMapper.java | 5 +- .../sonar/db}/permission/PermissionQuery.java | 3 +- .../db}/permission/PermissionTemplateDao.java | 14 +- .../db}/permission/PermissionTemplateDto.java | 7 +- .../PermissionTemplateGroupDto.java | 4 +- .../permission/PermissionTemplateMapper.java | 5 +- .../permission/PermissionTemplateUserDto.java | 2 +- .../db}/permission/UserWithPermissionDto.java | 3 +- .../sonar/db/permission}/package-info.java | 4 +- .../sonar/db}/profiling/InvocationUtils.java | 6 +- .../db}/profiling/ProfiledDataSource.java | 17 +- .../profiling/ProfilingConnectionHandler.java | 6 +- .../ProfilingPreparedStatementHandler.java | 7 +- .../profiling/ProfilingStatementHandler.java | 9 +- .../org/sonar/db/profiling/package-info.java | 24 ++ .../org/sonar/db/property}/PropertiesDao.java | 30 +- .../sonar/db/property}/PropertiesMapper.java | 10 +- .../org/sonar/db/property}/PropertyDto.java | 2 +- .../org/sonar/db/property}/PropertyQuery.java | 2 +- .../java/org/sonar/db}/purge/IdUuidPair.java | 2 +- .../java/org/sonar/db}/purge/IdUuidPairs.java | 2 +- .../org/sonar/db}/purge/PurgeCommands.java | 2 +- .../sonar/db}/purge/PurgeConfiguration.java | 17 +- .../java/org/sonar/db}/purge/PurgeDao.java | 16 +- .../org/sonar/db}/purge/PurgeListener.java | 2 +- .../java/org/sonar/db}/purge/PurgeMapper.java | 2 +- .../org/sonar/db}/purge/PurgeProfiler.java | 9 +- .../sonar/db}/purge/PurgeSnapshotQuery.java | 14 +- .../sonar/db}/purge/PurgeableSnapshotDto.java | 5 +- .../java/org/sonar/db/purge/package-info.java | 25 ++ .../purge}/period/DefaultPeriodCleaner.java | 10 +- .../db/purge}/period/DeleteAllFilter.java | 9 +- .../org/sonar/db/purge}/period/Filter.java | 5 +- .../org/sonar/db/purge}/period/Filters.java | 17 +- .../org/sonar/db/purge}/period/Interval.java | 9 +- .../sonar/db/purge}/period/KeepOneFilter.java | 9 +- .../sonar/db/purge/period}/package-info.java | 2 +- .../qualitygate}/ProjectQgateAssociation.java | 2 +- .../ProjectQgateAssociationDao.java | 9 +- .../ProjectQgateAssociationDto.java | 2 +- .../ProjectQgateAssociationMapper.java | 5 +- .../ProjectQgateAssociationQuery.java | 9 +- .../qualitygate}/QualityGateConditionDao.java | 11 +- .../qualitygate}/QualityGateConditionDto.java | 2 +- .../QualityGateConditionMapper.java | 2 +- .../sonar/db/qualitygate}/QualityGateDao.java | 7 +- .../sonar/db/qualitygate}/QualityGateDto.java | 2 +- .../db/qualitygate}/QualityGateMapper.java | 2 +- .../db/qualityprofile}/ActiveRuleDao.java | 9 +- .../db/qualityprofile}/ActiveRuleDto.java | 6 +- .../db/qualityprofile}/ActiveRuleKey.java | 5 +- .../db/qualityprofile}/ActiveRuleMapper.java | 12 +- .../qualityprofile}/ActiveRuleParamDto.java | 11 +- .../ProjectQprofileAssociationDto.java | 2 +- .../db/qualityprofile}/QualityProfileDao.java | 30 +- .../db/qualityprofile}/QualityProfileDto.java | 10 +- .../qualityprofile}/QualityProfileMapper.java | 10 +- .../QualityProfileProjectCount.java | 3 +- .../main/java/org/sonar/db}/rule/RuleDao.java | 11 +- .../main/java/org/sonar/db}/rule/RuleDto.java | 5 +- .../java/org/sonar/db}/rule/RuleMapper.java | 10 +- .../java/org/sonar/db}/rule/RuleParamDto.java | 7 +- .../org/sonar/db/semaphore}/SemaphoreDao.java | 6 +- .../org/sonar/db/semaphore}/SemaphoreDto.java | 2 +- .../sonar/db/semaphore}/SemaphoreMapper.java | 2 +- .../sonar/db/semaphore}/SemaphoreUpdater.java | 2 +- .../sonar/db/semaphore}/SemaphoresImpl.java | 2 +- .../org/sonar/db/semaphore/package-info.java | 24 ++ .../org/sonar/db/source}/FileSourceDto.java | 18 +- .../sonar/db/source}/FileSourceMapper.java | 8 +- .../java/org/sonar/db}/user/AuthorDao.java | 25 +- .../java/org/sonar/db}/user/AuthorDto.java | 6 +- .../java/org/sonar/db}/user/AuthorMapper.java | 5 +- .../org/sonar/db}/user/AuthorizationDao.java | 20 +- .../sonar/db}/user/AuthorizationMapper.java | 5 +- .../java/org/sonar/db}/user/GroupDto.java | 5 +- .../java/org/sonar/db}/user/GroupMapper.java | 2 +- .../sonar/db}/user/GroupMembershipDao.java | 12 +- .../sonar/db}/user/GroupMembershipDto.java | 3 +- .../sonar/db}/user/GroupMembershipMapper.java | 2 +- .../sonar/db}/user/GroupMembershipQuery.java | 3 +- .../java/org/sonar/db}/user/GroupRoleDto.java | 2 +- .../org/sonar/db}/user/GroupUserCount.java | 2 +- .../java/org/sonar/db}/user/LoginGroup.java | 2 +- .../main/java/org/sonar/db}/user/RoleDao.java | 12 +- .../java/org/sonar/db}/user/RoleMapper.java | 2 +- .../main/java/org/sonar/db}/user/UserDao.java | 23 +- .../main/java/org/sonar/db}/user/UserDto.java | 11 +- .../java/org/sonar/db}/user/UserGroupDto.java | 2 +- .../org/sonar/db}/user/UserGroupMapper.java | 2 +- .../java/org/sonar/db}/user/UserMapper.java | 8 +- .../org/sonar/db}/user/UserMembershipDto.java | 2 +- .../sonar/db}/user/UserMembershipQuery.java | 3 +- .../java/org/sonar/db}/user/UserRoleDto.java | 3 +- .../sonar/db/version}/DatabaseVersion.java | 10 +- .../sonar/db/version}/SchemaMigrationDto.java | 4 +- .../db/version}/SchemaMigrationMapper.java | 2 +- .../org/sonar/db/version/package-info.java | 24 ++ .../org/sonar/db/version}/v44/ChangeLog.java | 2 +- .../db/version}/v44/Migration44Mapper.java | 10 +- .../sonar/db/version}/v44/ProfileMeasure.java | 2 +- .../sonar/db/version}/v44/QProfileDto44.java | 2 +- .../sonar/db/version/v44}/package-info.java | 2 +- .../db/version}/v45/Migration45Mapper.java | 2 +- .../java/org/sonar/db/version}/v45/Rule.java | 8 +- .../sonar/db/version}/v45/RuleParameter.java | 7 +- .../sonar/db/version/v45/package-info.java | 24 ++ .../org/sonar/db/version}/v50/Component.java | 2 +- .../db/version}/v50/Migration50Mapper.java | 2 +- .../sonar/db/version/v50/package-info.java | 25 ++ .../resources/org/sonar/db}/IsAliveMapper.xml | 4 +- .../org/sonar/db/activity}/ActivityMapper.xml | 2 +- .../db/component}/ComponentIndexMapper.xml | 2 +- .../db/component}/ComponentLinkMapper.xml | 8 +- .../sonar/db/component}/ComponentMapper.xml | 81 ++-- .../db/component}/ResourceIndexerMapper.xml | 2 +- .../component}/ResourceKeyUpdaterMapper.xml | 2 +- .../sonar/db/component}/ResourceMapper.xml | 65 +-- .../sonar/db/component}/SnapshotMapper.xml | 4 +- .../db/compute}/AnalysisReportMapper.xml | 5 +- .../db}/dashboard/ActiveDashboardMapper.xml | 20 +- .../sonar/db}/dashboard/DashboardMapper.xml | 2 +- .../org/sonar/db}/dashboard/WidgetMapper.xml | 14 +- .../db}/dashboard/WidgetPropertyMapper.xml | 6 +- .../sonar/db/debt}/CharacteristicMapper.xml | 36 +- .../db}/duplication/DuplicationMapper.xml | 7 +- .../org/sonar/db/event}/EventMapper.xml | 27 +- .../org/sonar/db/issue}/ActionPlanMapper.xml | 19 +- .../sonar/db/issue}/ActionPlanStatsMapper.xml | 10 +- .../org/sonar/db/issue}/IssueChangeMapper.xml | 2 +- .../db/issue}/IssueFilterFavouriteMapper.xml | 12 +- .../org/sonar/db/issue}/IssueFilterMapper.xml | 27 +- .../org/sonar/db/issue}/IssueMapper.xml | 5 +- .../loadedtemplate}/LoadedTemplateMapper.xml | 2 +- .../sonar/db/measure}/CustomMeasureMapper.xml | 2 +- .../sonar/db/measure}/MeasureFilterMapper.xml | 9 +- .../org/sonar/db/measure}/MeasureMapper.xml | 19 +- .../org/sonar/db/metric}/MetricMapper.xml | 18 +- .../notification}/NotificationQueueMapper.xml | 20 +- .../sonar/db}/permission/PermissionMapper.xml | 6 +- .../permission/PermissionTemplateMapper.xml | 76 ++-- .../sonar/db/property}/PropertiesMapper.xml | 8 +- .../org/sonar/db}/purge/PurgeMapper.xml | 2 +- .../ProjectQgateAssociationMapper.xml | 5 +- .../QualityGateConditionMapper.xml | 29 +- .../db/qualitygate}/QualityGateMapper.xml | 20 +- .../db/qualityprofile}/ActiveRuleMapper.xml | 7 +- .../qualityprofile}/QualityProfileMapper.xml | 61 +-- .../org/sonar/db}/rule/RuleMapper.xml | 15 +- .../sonar/db/semaphore}/SemaphoreMapper.xml | 10 +- .../org/sonar/db/source}/FileSourceMapper.xml | 31 +- .../sonar/db/source}/SnapshotDataMapper.xml | 11 +- .../org/sonar/db}/user/AuthorMapper.xml | 8 +- .../sonar/db}/user/AuthorizationMapper.xml | 59 ++- .../org/sonar/db}/user/GroupMapper.xml | 20 +- .../sonar/db}/user/GroupMembershipMapper.xml | 29 +- .../org/sonar/db}/user/RoleMapper.xml | 6 +- .../org/sonar/db}/user/UserGroupMapper.xml | 8 +- .../org/sonar/db}/user/UserMapper.xml | 14 +- .../db/version}/SchemaMigrationMapper.xml | 2 +- .../org/sonar/db/version}/rows-h2.sql | 0 .../org/sonar/db/version}/schema-h2.ddl | 0 .../db/version}/v44/Migration44Mapper.xml | 20 +- .../db/version}/v45/Migration45Mapper.xml | 2 +- .../db/version}/v50/Migration50Mapper.xml | 2 +- .../sonar/core/issue/ActionPlanStatsTest.java | 3 +- .../sonar/core/timemachine/PeriodsTest.java | 12 +- .../core/user/DefaultUserFinderTest.java | 11 +- .../org/sonar/core/user/DefaultUserTest.java | 0 .../core/user/DeprecatedUserFinderTest.java | 3 +- .../org/sonar/db}/AbstractDaoTestCase.java | 32 +- .../java/org/sonar/db}/BatchSessionTest.java | 30 +- .../test/java/org/sonar/db}/DaoUtilsTest.java | 5 +- .../java/org/sonar/db}/DatabaseCommands.java | 33 +- .../java/org/sonar/db}/DatabaseUtilsTest.java | 7 +- .../src/test/java/org/sonar/db}/DbTester.java | 53 ++- .../test/java/org/sonar/db}/DdlUtilsTest.java | 10 +- .../org/sonar/db}/DefaultDatabaseTest.java | 8 +- .../test/java/org/sonar/db}/H2Database.java | 6 +- .../java/org/sonar/db}/H2DatabaseTest.java | 8 +- .../java/org/sonar/db}/IsAliveMapperTest.java | 2 +- .../test/java/org/sonar/db}/MyBatisTest.java | 14 +- .../sonar/db}/component/ComponentDtoTest.java | 2 +- .../db}/component/ComponentLinkDtoTest.java | 2 +- .../sonar/db/component}/ResourceDaoTest.java | 15 +- .../db/component}/ResourceIndexerDaoTest.java | 11 +- .../component}/ResourceKeyUpdaterDaoTest.java | 7 +- .../sonar/db}/component/SnapshotDtoTest.java | 2 +- .../db/component}/SnapshotQueryTest.java | 6 +- .../db}/dashboard/ActiveDashboardDaoTest.java | 4 +- .../sonar/db}/dashboard/DashboardDaoTest.java | 7 +- .../sonar/db/debt}/CharacteristicDaoTest.java | 6 +- .../sonar/db/debt}/CharacteristicDtoTest.java | 6 +- .../sonar/db}/dialect/DialectUtilsTest.java | 2 +- .../java/org/sonar/db}/dialect/H2Test.java | 2 +- .../java/org/sonar/db}/dialect/MsSqlTest.java | 2 +- .../java/org/sonar/db}/dialect/MySqlTest.java | 2 +- .../org/sonar/db}/dialect/OracleTest.java | 2 +- .../org/sonar/db}/dialect/PostgreSqlTest.java | 3 +- .../db}/duplication/DuplicationDaoTest.java | 9 +- .../org/sonar/db}/event/EventDtoTest.java | 2 +- .../sonar/db/issue}/ActionPlanDaoTest.java | 23 +- .../db/issue}/ActionPlanStatsDaoTest.java | 7 +- .../sonar/db/issue}/IssueChangeDaoTest.java | 8 +- .../sonar/db/issue}/IssueChangeDtoTest.java | 4 +- .../db/issue}/IssueChangeMapperTest.java | 6 +- .../org/sonar/db/issue}/IssueDaoTest.java | 6 +- .../org/sonar/db/issue}/IssueDtoTest.java | 13 +- .../sonar/db/issue}/IssueFilterDaoTest.java | 13 +- .../issue}/IssueFilterFavouriteDaoTest.java | 13 +- .../org/sonar/db/issue}/IssueMapperTest.java | 6 +- .../LoadedTemplateDaoTest.java | 4 +- .../org/sonar/db/measure}/MeasureDtoTest.java | 3 +- .../db/measure}/MeasureFilterDaoTest.java | 6 +- .../sonar/db/measure}/PastMeasureDtoTest.java | 2 +- .../org/sonar/db/metric}/MetricDtoTest.java | 2 +- .../NotificationQueueDaoTest.java | 9 +- .../GroupWithPermissionDaoTest.java | 7 +- .../GroupWithPermissionDtoTest.java | 3 +- .../GroupWithPermissionTemplateDaoTest.java | 7 +- .../permission/GroupWithPermissionTest.java | 3 +- .../db}/permission/PermissionFacadeTest.java | 12 +- .../permission/PermissionTemplateDaoTest.java | 21 +- .../permission/UserWithPermissionDaoTest.java | 10 +- .../permission/UserWithPermissionDtoTest.java | 3 +- .../UserWithPermissionTemplateDaoTest.java | 10 +- .../permission/UserWithPermissionTest.java | 3 +- .../db}/profiling/InvocationUtilsTest.java | 9 +- .../db}/profiling/ProfiledDataSourceTest.java | 14 +- .../sonar/db/property}/PropertiesDaoTest.java | 11 +- .../sonar/db/property}/PropertyDtoTest.java | 4 +- .../sonar/db/purge}/DbCleanerTestUtils.java | 3 +- .../org/sonar/db}/purge/IdUuidPairsTest.java | 5 +- .../sonar/db}/purge/PurgeCommandsTest.java | 6 +- .../db}/purge/PurgeConfigurationTest.java | 10 +- .../org/sonar/db}/purge/PurgeDaoTest.java | 17 +- .../sonar/db}/purge/PurgeProfilerTest.java | 4 +- .../db}/purge/PurgeableSnapshotDtoTest.java | 4 +- .../period/DefaultPeriodCleanerTest.java | 10 +- .../db/purge}/period/DeleteAllFilterTest.java | 11 +- .../sonar/db/purge}/period/IntervalTest.java | 11 +- .../db/purge}/period/KeepOneFilterTest.java | 14 +- .../ProjectQgateAssociationDaoTest.java | 7 +- .../ProjectQgateAssociationDtoTest.java | 2 +- .../ProjectQgateAssociationQueryTest.java | 2 +- .../QualityGateConditionDaoTest.java | 4 +- .../QualityGateConditionDtoTest.java | 16 +- .../db/qualitygate}/QualityGateDaoTest.java | 9 +- .../db/qualityprofile}/ActiveRuleDaoTest.java | 9 +- .../db/qualityprofile}/ActiveRuleKeyTest.java | 2 +- .../ActiveRuleParamDtoTest.java | 7 +- .../QualityProfileDaoTest.java | 15 +- .../java/org/sonar/db}/rule/RuleDaoTest.java | 7 +- .../sonar/db/semaphore}/SemaphoreDaoTest.java | 11 +- .../db/semaphore}/SemaphoreUpdaterTest.java | 3 +- .../db/semaphore}/SemaphoresImplTest.java | 2 +- .../sonar/db/source}/FileSourceDtoTest.java | 7 +- .../org/sonar/db}/user/AuthorDaoTest.java | 8 +- .../sonar/db}/user/AuthorizationDaoTest.java | 11 +- .../java/org/sonar/db}/user/GroupDtoTest.java | 2 +- .../db}/user/GroupMembershipDaoTest.java | 18 +- .../db}/user/GroupMembershipDtoTest.java | 3 +- .../db}/user/GroupMembershipQueryTest.java | 2 +- .../sonar/db}/user/GroupMembershipTest.java | 3 +- .../java/org/sonar/db}/user/RoleDaoTest.java | 6 +- .../org/sonar/db}/user/RoleMapperTest.java | 7 +- .../java/org/sonar/db}/user/UserDaoTest.java | 15 +- .../java/org/sonar/db}/user/UserDtoTest.java | 5 +- .../db/version}/DatabaseVersionTest.java | 4 +- .../sonar/db/version}/v44/ChangeLogTest.java | 2 +- .../db/version}/v44/ProfileMeasureTest.java | 2 +- .../sonar/db/version}/v50/ComponentTest.java | 2 +- .../jpa/test/AbstractDbUnitTestCase.java | 17 +- .../src/test/resources/logback-test.xml | 11 +- .../some-properties.xml | 0 .../DefaultModelFinderTest/shared.xml | 13 + ...il_when_no_default_template_is_defined.xml | 0 .../grantDefaultRoles-result.xml | 0 .../grantDefaultRoles.xml | 6 +- .../grantDefaultRolesPattern-result.xml | 8 +- .../grantDefaultRolesPattern.xml | 12 +- .../grantDefaultRolesProject-result.xml | 6 +- .../grantDefaultRolesProject.xml | 6 +- .../grantDefaultRolesSeveralPattern.xml | 12 +- ...grantDefaultRoles_unknown_group-result.xml | 0 .../grantDefaultRoles_unknown_group.xml | 6 +- .../grantDefaultRoles_users-result.xml | 0 .../grantDefaultRoles_users.xml | 8 +- .../grantGroupRole-result.xml | 0 .../grantGroupRole.xml | 4 + .../grantGroupRole_anyone-result.xml | 6 + .../grantGroupRole_anyone.xml | 4 + ...pRole_ignore_if_group_not_found-result.xml | 6 +- ...antGroupRole_ignore_if_group_not_found.xml | 6 +- ...oupRole_ignore_if_not_persisted-result.xml | 6 +- ...grantGroupRole_ignore_if_not_persisted.xml | 6 +- .../grantUserRole-result.xml | 0 .../grantUserRole.xml | 4 +- .../hasRoles.xml | 0 .../user/DeprecatedUserFinderTest/fixture.xml | 6 +- ...g-ghost-projects-and-technical-project.xml | 88 ++-- .../db/component/ResourceDaoTest/fixture.xml | 86 ++++ .../getResources_exclude_disabled.xml | 6 +- .../get_last_snapshot_by_component_uuid.xml | 85 ++++ .../ResourceDaoTest/insert-result.xml | 6 +- .../db/component/ResourceDaoTest}/insert.xml | 0 .../ResourceDaoTest/update-result.xml | 3 +- .../db/component}/ResourceDaoTest/update.xml | 3 +- .../update_authorization_date-result.xml | 3 +- .../update_authorization_date.xml | 3 +- .../shouldIndexMultiModulesProject-result.xml | 0 .../shouldIndexMultiModulesProject.xml | 0 .../shouldIndexProjects-result.xml | 9 +- .../shouldIndexProjects.xml | 12 +- .../shouldIndexResource-result.xml | 0 .../shouldIndexResource.xml | 0 ...ouldIndexTwoLettersLongResource-result.xml | 0 .../shouldIndexTwoLettersLongResource.xml | 0 .../shouldNotIndexPackages.xml | 12 +- ...ouldNotReindexUnchangedResource-result.xml | 0 .../shouldNotReindexUnchangedResource.xml | 0 ...eIndexNewTwoLettersLongResource-result.xml | 0 ...shouldReIndexNewTwoLettersLongResource.xml | 3 +- ...ldReIndexTwoLettersLongResource-result.xml | 0 .../shouldReIndexTwoLettersLongResource.xml | 3 +- ...ouldReindexProjectAfterRenaming-result.xml | 3 +- .../shouldReindexProjectAfterRenaming.xml | 3 +- .../shouldReindexResource-result.xml | 0 .../shouldReindexResource.xml | 0 .../ResourceKeyUpdaterDaoTest/shared.xml | 50 ++- .../shouldBulkUpdateKey-result.xml | 53 ++- ...BulkUpdateKeyOnOnlyOneSubmodule-result.xml | 50 ++- .../shouldNotUpdateAllSubmodules-result.xml | 47 ++- .../shouldNotUpdateAllSubmodules.xml | 44 +- .../shouldUpdateKey-result.xml | 50 ++- .../ActiveDashboardDaoTest/empty.xml | 0 .../shouldGetMaxOrderIndexForNullUser.xml | 21 + .../shouldInsert-result.xml | 9 + .../ActiveDashboardDaoTest/shouldInsert.xml | 0 .../shouldInsertWithNoUser-result.xml | 9 + .../shouldSelectDashboardsForAnonymous.xml | 10 +- .../shouldSelectDashboardsForUser.xml | 14 +- ...uldSelectProjectDashboardsForAnonymous.xml | 10 +- .../shouldSelectProjectDashboardsForUser.xml | 14 +- .../DashboardDaoTest/shouldInsert-result.xml | 6 +- .../DashboardDaoTest/shouldInsert.xml | 0 ...shouldInsertWithNullableColumns-result.xml | 6 +- .../shouldSelectGlobalDashboard.xml | 0 .../insert_characteristic-result.xml | 3 +- .../select_enabled_root_characteristics.xml | 9 +- ...eristics_order_by_characteristic_order.xml | 0 ..._when_characteristics_are_all_disabled.xml | 3 +- ...elect_sub_characteristics_by_parent_id.xml | 12 +- .../db/debt}/CharacteristicDaoTest/shared.xml | 9 +- .../update_characteristic-result.xml | 3 +- .../update_characteristic.xml | 3 +- .../RequirementDaoTest/select_requirement.xml | 6 +- .../db/debt}/RequirementDaoTest/shared.xml | 12 +- .../DuplicationDaoTest/shouldGetByHash.xml | 55 +-- .../shouldInsert-result.xml | 9 +- .../DuplicationDaoTest/shouldInsert.xml | 6 +- .../db/issue/ActionPlanDaoTest/shared.xml | 5 + .../should_delete_action_plan-result.xml | 2 +- .../should_delete_action_plan.xml | 4 +- .../ActionPlanDaoTest/should_find_by_key.xml | 2 +- .../ActionPlanDaoTest/should_find_by_keys.xml | 6 +- .../should_find_by_name_and_project_id.xml | 6 +- .../should_find_open_by_project_id.xml | 6 +- .../should_insert_new_action_plan-result.xml | 2 +- .../should_update_action_plan-result.xml | 2 +- .../should_update_action_plan.xml | 2 +- .../issue/ActionPlanStatsDaoTest/shared.xml | 5 + .../should_find_by_project.xml | 81 ++++ .../IssueChangeDaoTest/delete-result.xml | 0 .../db/issue}/IssueChangeDaoTest/delete.xml | 0 .../db/issue}/IssueChangeDaoTest/empty.xml | 0 .../IssueChangeDaoTest/insert-result.xml | 0 ...tChangelogOfNonClosedIssuesByComponent.xml | 182 ++++++++ .../db/issue/IssueChangeDaoTest/shared.xml | 63 +++ .../IssueChangeDaoTest/update-result.xml | 38 ++ .../db/issue}/IssueChangeDaoTest/update.xml | 0 .../insert_comment-result.xml | 13 + .../insert_diff-result.xml | 13 + .../find_severities_by_component.xml | 80 ++++ .../sonar/db/issue/IssueDaoTest/shared.xml | 26 ++ .../should_select_issue_and_component_ids.xml | 80 ++++ ...uld_select_non_closed_issues_by_module.xml | 133 ++++++ ...ed_issues_by_module_on_removed_project.xml | 127 ++++++ .../db/issue/IssueFilterDaoTest/shared.xml | 23 ++ .../should_delete-result.xml | 13 + .../should_insert-result.xml | 34 ++ .../should_select_by_user.xml | 33 ++ ...ect_by_user_with_only_favorite_filters.xml | 39 ++ .../should_select_provided_by_name.xml | 58 +++ .../should_update-result.xml | 23 ++ .../IssueFilterFavouriteDaoTest/shared.xml | 21 + .../should_delete-result.xml | 15 + ...hould_delete_by_issue_filter_id-result.xml | 9 + .../should_insert-result.xml | 27 ++ .../IssueMapperTest/testInsert-result.xml | 29 ++ .../IssueMapperTest/testUpdate-result.xml | 29 ++ .../db/issue/IssueMapperTest/testUpdate.xml | 27 ++ ...eforeSelectedDate_with_conflict-result.xml | 30 ++ ...updateBeforeSelectedDate_with_conflict.xml | 28 ++ .../should_select_assignees.xml | 80 ++++ .../shouldCountByTypeAndKey.xml | 0 .../shouldInsert-result.xml | 8 + .../LoadedTemplateDaoTest/shouldInsert.xml | 0 .../measure}/MeasureFilterDaoTest/shared.xml | 4 +- .../shouldInsert-result.xml | 0 .../should_delete_notification-result.xml | 4 +- .../should_delete_notification.xml | 8 +- .../should_findOldest.xml | 8 +- ...d_insert_new_notification_queue-result.xml | 2 +- .../groups_with_permissions.xml | 0 ...issions_should_be_sorted_by_group_name.xml | 0 .../groups_with_permissions.xml | 0 ...issions_should_be_sorted_by_group_name.xml | 4 +- .../should_add_user_permission-result.xml | 3 +- .../should_add_user_permission.xml | 3 +- ...hould_apply_permission_template-result.xml | 6 +- .../should_apply_permission_template.xml | 9 +- .../should_count_component_permissions.xml | 0 .../should_delete_group_permission-result.xml | 3 +- .../should_delete_group_permission.xml | 3 +- .../should_delete_user_permission-result.xml | 3 +- .../should_delete_user_permission.xml | 3 +- ..._insert_anyone_group_permission-result.xml | 3 +- .../should_insert_anyone_group_permission.xml | 3 +- .../should_insert_group_permission-result.xml | 3 +- .../should_insert_group_permission.xml | 3 +- .../should_remove_all_permissions-result.xml | 0 .../should_remove_all_permissions.xml | 0 .../addGroupPermissionToTemplate-result.xml | 0 .../addGroupPermissionToTemplate.xml | 0 ...ddNullGroupPermissionToTemplate-result.xml | 0 .../addNullGroupPermissionToTemplate.xml | 0 .../addUserPermissionToTemplate-result.xml | 0 .../addUserPermissionToTemplate.xml | 0 ...reateNonAsciiPermissionTemplate-result.xml | 4 + .../createNonAsciiPermissionTemplate.xml | 0 .../createPermissionTemplate-result.xml | 4 + .../createPermissionTemplate.xml | 0 .../deletePermissionTemplate-result.xml | 8 + .../deletePermissionTemplate.xml | 8 +- ...moveGroupPermissionFromTemplate-result.xml | 0 .../removeGroupPermissionFromTemplate.xml | 0 ...NullGroupPermissionFromTemplate-result.xml | 5 +- .../removeNullGroupPermissionFromTemplate.xml | 5 +- ...emoveUserPermissionFromTemplate-result.xml | 0 .../removeUserPermissionFromTemplate.xml | 0 .../remove_by_group-result.xml | 0 .../remove_by_group.xml | 0 .../selectAllPermissionTemplates.xml | 8 + .../selectEmptyPermissionTemplate.xml | 10 + .../selectPermissionTemplate.xml | 9 +- .../updatePermissionTemplate-result.xml | 6 + .../updatePermissionTemplate.xml | 6 + .../select_only_enable_users.xml | 0 .../users_with_permissions.xml | 0 ...missions_should_be_sorted_by_user_name.xml | 0 .../select_only_enable_users.xml | 0 .../users_with_permissions.xml | 0 ...missions_should_be_sorted_by_user_name.xml | 0 .../deleteAllProperties-result.xml | 0 .../PropertiesDaoTest/deleteAllProperties.xml | 0 .../deleteGlobalProperties-result.xml | 0 .../deleteGlobalProperties.xml | 0 .../deleteGlobalProperty-result.xml | 0 .../deleteGlobalProperty.xml | 0 .../delete_project_properties-result.xml | 0 .../delete_project_properties.xml | 0 .../delete_project_property-result.xml | 0 .../delete_project_property.xml | 0 .../findNotificationSubscribers.xml | 55 +++ .../PropertiesDaoTest/insert-result.xml | 0 .../db/property}/PropertiesDaoTest/insert.xml | 0 .../insertGlobalProperties-result.xml | 0 .../insertGlobalProperties.xml | 0 .../renamePropertyKey-result.xml | 0 .../PropertiesDaoTest/renamePropertyKey.xml | 0 .../selectGlobalProperties.xml | 0 .../selectProjectProperties.xml | 0 .../selectProjectPropertiesByResourceId.xml | 0 .../PropertiesDaoTest/select_by_query.xml | 0 .../select_module_properties_tree.xml | 18 +- .../shouldFindUsersForNotification.xml | 6 +- .../should_not_rename_if_same_key-result.xml | 0 .../should_not_rename_if_same_key.xml | 0 .../PropertiesDaoTest/update-result.xml | 0 .../db/property}/PropertiesDaoTest/update.xml | 0 .../updateGlobalProperties-result.xml | 0 .../updateGlobalProperties.xml | 0 ...ertiesFromKeyAndValueToNewValue-result.xml | 0 ...atePropertiesFromKeyAndValueToNewValue.xml | 0 .../shouldDeleteResource.xml | 2 +- .../shouldDeleteSnapshot-result.xml | 0 .../shouldDeleteSnapshot.xml | 0 ...stedMeasuresWhenPurgingSnapshot-result.xml | 0 ...eleteWastedMeasuresWhenPurgingSnapshot.xml | 0 .../shouldPurgeSnapshot-result.xml | 0 .../PurgeCommandsTest/shouldPurgeSnapshot.xml | 0 ...e_sources_of_disabled_resources-result.xml | 10 +- ...ete_file_sources_of_disabled_resources.xml | 20 +- ...resources_without_last_snapshot-result.xml | 0 ...isable_resources_without_last_snapshot.xml | 63 ++- .../select_purgeable_file_uuids.xml | 10 +- .../shouldDeleteAbortedBuilds-result.xml | 25 +- .../shouldDeleteAbortedBuilds.xml | 12 +- ...oricalDataOfDirectoriesAndFiles-result.xml | 62 +-- ...eteHistoricalDataOfDirectoriesAndFiles.xml | 36 +- .../PurgeDaoTest/shouldDeleteProject.xml | 6 +- .../shouldDeleteSnapshots-result.xml | 8 +- .../PurgeDaoTest/shouldDeleteSnapshots.xml | 9 +- .../shouldPurgeProject-result.xml | 15 +- .../purge/PurgeDaoTest/shouldPurgeProject.xml | 17 +- .../shouldSelectPurgeableSnapshots.xml | 18 +- ...should_delete_all_closed_issues-result.xml | 0 .../should_delete_all_closed_issues.xml | 0 ...should_delete_old_closed_issues-result.xml | 42 +- .../should_delete_old_closed_issues.xml | 0 .../ProjectQgateAssociationDaoTest/shared.xml | 27 +- .../delete-result.xml | 12 + .../insert-result.xml | 3 +- .../QualityGateConditionDaoTest}/insert.xml | 0 .../selectForQualityGate.xml | 14 + .../shouldCleanConditions-result.xml | 17 +- .../shouldCleanConditions.xml | 26 ++ .../update-result.xml | 14 + .../QualityGateDaoTest/delete-result.xml | 6 + .../QualityGateDaoTest/insert-result.xml | 5 + .../QualityGateDaoTest}/insert.xml | 0 .../QualityGateDaoTest/selectAll.xml | 7 + .../QualityGateDaoTest/update-result.xml | 7 + .../ActiveRuleDaoTest/delete-result.xml | 6 +- .../delete_from_profile-result.xml | 3 +- .../delete_from_rule-result.xml | 6 +- .../delete_parameter-result.xml | 6 +- .../delete_parameters-result.xml | 6 +- ...lete_parameters_from_profile_id-result.xml | 9 +- .../delete_parameters_from_profile_id.xml | 9 +- .../ActiveRuleDaoTest/empty.xml | 0 .../ActiveRuleDaoTest/insert-result.xml | 3 +- .../insert_parameter-result.xml | 0 .../ActiveRuleDaoTest/shared.xml | 9 +- .../ActiveRuleDaoTest/update-result.xml | 12 + .../update_parameter-result.xml | 0 .../QualityProfileDaoTest/delete-result.xml | 0 .../QualityProfileDaoTest/inheritance.xml | 0 .../QualityProfileDaoTest/insert-result.xml | 0 .../QualityProfileDaoTest/projects.xml | 0 .../select_all_is_sorted_by_profile_name.xml | 0 .../select_by_language.xml | 6 +- .../QualityProfileDaoTest/shared.xml | 0 .../QualityProfileDaoTest/update-result.xml | 0 .../org/sonar/db}/rule/RuleDaoTest/empty.xml | 0 .../db}/rule/RuleDaoTest/insert-result.xml | 8 +- .../rule/RuleDaoTest/insert_all-result.xml | 16 +- .../RuleDaoTest/insert_parameter-result.xml | 0 .../db}/rule/RuleDaoTest/insert_parameter.xml | 0 .../sonar/db/rule/RuleDaoTest/selectAll.xml | 14 + .../sonar/db/rule/RuleDaoTest/selectById.xml | 8 + .../db/rule/RuleDaoTest/selectNonManual.xml | 8 + .../db/rule/RuleDaoTest/selectParameters.xml | 8 + .../db/rule/RuleDaoTest/select_by_name.xml | 8 + .../rule/RuleDaoTest/select_by_rule_key.xml | 8 + .../select_by_sub_characteristic_id.xml | 31 +- .../select_enables_and_non_manual.xml | 12 +- .../select_parameters_by_rule_id.xml | 12 + .../select_parameters_by_rule_ids.xml | 9 + .../db/rule/RuleDaoTest/update-result.xml | 27 ++ .../org/sonar/db/rule/RuleDaoTest/update.xml | 18 + .../RuleDaoTest/update_parameter-result.xml | 4 + .../db}/rule/RuleDaoTest/update_parameter.xml | 0 .../SemaphoreDaoTest/old_semaphore.xml | 4 + .../add_missing_module_uuid_path-result.xml | 6 +- .../add_missing_module_uuid_path.xml | 0 .../AuthorDaoTest/countDeveloperLogins.xml | 7 + .../shouldInsertAuthor-result.xml | 2 +- .../user/AuthorDaoTest/shouldInsertAuthor.xml | 0 .../shouldInsertAuthorAndDeveloper-result.xml | 5 + .../shouldInsertAuthorAndDeveloper.xml | 0 ...AuthorsAndDevelopersDuplication-result.xml | 8 + ...PreventAuthorsAndDevelopersDuplication.xml | 8 + ...shouldPreventAuthorsDuplication-result.xml | 5 + .../shouldPreventAuthorsDuplication.xml | 5 + .../AuthorDaoTest/shouldSelectByLogin.xml | 2 +- .../anonymous_should_be_authorized.xml | 0 .../group_should_be_authorized.xml | 0 ...ed_component_key_for_global_permission.xml | 0 ...p_authorized_project_ids_for_anonymous.xml | 0 .../keep_authorized_project_ids_for_group.xml | 0 .../keep_authorized_project_ids_for_user.xml | 0 ...eturn_global_permissions_for_anonymous.xml | 0 ...rn_global_permissions_for_group_anyone.xml | 2 +- ...should_return_group_global_permissions.xml | 4 +- ...return_root_project_keys_for_anonymous.xml | 9 +- ...uld_return_root_project_keys_for_group.xml | 9 +- ...ould_return_root_project_keys_for_user.xml | 9 +- .../should_return_user_global_permissions.xml | 4 +- .../user_should_be_authorized.xml | 0 .../select_user_group.xml | 0 .../user/GroupMembershipDaoTest/shared.xml | 0 .../shared_plus_empty_group.xml | 0 .../should_be_sorted_by_group_name.xml | 0 ...deleteGroupPermissionsByGroupId-result.xml | 0 .../deleteGroupPermissionsByGroupId.xml | 0 .../globalGroupPermissions-result.xml | 0 .../RoleDaoTest/globalGroupPermissions.xml | 0 .../globalUserPermissions-result.xml | 0 .../RoleDaoTest/globalUserPermissions.xml | 0 .../resourceGroupPermissions-result.xml | 0 .../RoleDaoTest/resourceGroupPermissions.xml | 0 .../resourceUserPermissions-result.xml | 0 .../RoleDaoTest/resourceUserPermissions.xml | 0 .../db}/user/RoleMapperTest/countRoles.xml | 0 .../deleteRolesByResourceId-result.xml | 0 .../deleteRolesByResourceId.xml | 0 .../RoleMapperTest/insertRoles-result.xml | 0 .../db}/user/RoleMapperTest/insertRoles.xml | 0 .../UserDaoTest/deactivate_user-result.xml | 24 +- .../db}/user/UserDaoTest/deactivate_user.xml | 33 +- .../db}/user/UserDaoTest/insert-result.xml | 3 +- .../UserDaoTest/selectActiveUserByLogin.xml | 14 + .../user/UserDaoTest/selectGroupByName.xml | 3 +- .../user/UserDaoTest/selectUsersByLogins.xml | 9 + .../user/UserDaoTest/selectUsersByQuery.xml | 7 + .../db/user/UserDaoTest/selectUsersByText.xml | 7 + .../db}/user/UserDaoTest/update_user.xml | 3 +- .../DatabaseVersionTest/getVersion.xml | 0 .../getVersion_no_rows.xml | 0 .../dao/ProfilesDaoTest/shouldGetProfiles.xml | 0 1639 files changed, 7442 insertions(+), 8356 deletions(-) rename {sonar-core/src/main/java/org/sonar/core/issue/db => server/sonar-server/src/main/java/org/sonar/server/computation/issue}/UpdateConflictResolver.java (96%) rename server/sonar-server/src/main/java/org/sonar/server/db/{Dao.java => DeprecatedDao.java} (92%) rename {sonar-core/src/main/java/org/sonar/core/issue/db => server/sonar-server/src/main/java/org/sonar/server/issue}/IssueStorage.java (95%) rename {sonar-core/src/main/java/org/sonar/core/issue => server/sonar-server/src/main/java/org/sonar/server/issue/actionplan}/ActionPlanDeadlineComparator.java (97%) rename {sonar-core/src/main/java/org/sonar/core/issue => server/sonar-server/src/main/java/org/sonar/server/issue/filter}/IssueFilterSerializer.java (98%) rename {sonar-core/src/test/java/org/sonar/core/issue/db => server/sonar-server/src/test/java/org/sonar/server/computation/issue}/UpdateConflictResolverTest.java (94%) rename {sonar-core/src/test/java/org/sonar/core/issue/db => server/sonar-server/src/test/java/org/sonar/server/issue}/IssueStorageTest.java (97%) rename {sonar-core/src/test/java/org/sonar/core/issue => server/sonar-server/src/test/java/org/sonar/server/issue/actionplan}/ActionPlanDeadlineComparatorTest.java (96%) rename {sonar-core/src/test/java/org/sonar/core/issue => server/sonar-server/src/test/java/org/sonar/server/issue/filter}/IssueFilterSerializerTest.java (98%) rename {sonar-core/src/test/resources/org/sonar/core/issue/db => server/sonar-server/src/test/resources/org/sonar/server/issue}/IssueStorageTest/should_insert_new_issues-result.xml (99%) rename {sonar-core/src/test/resources/org/sonar/core/issue/db => server/sonar-server/src/test/resources/org/sonar/server/issue}/IssueStorageTest/should_resolve_conflicts_on_updates-result.xml (99%) rename {sonar-core/src/test/resources/org/sonar/core/issue/db => server/sonar-server/src/test/resources/org/sonar/server/issue}/IssueStorageTest/should_resolve_conflicts_on_updates.xml (99%) rename {sonar-core/src/test/resources/org/sonar/core/issue/db => server/sonar-server/src/test/resources/org/sonar/server/issue}/IssueStorageTest/should_update_issues-result.xml (99%) rename {sonar-core/src/test/resources/org/sonar/core/issue/db => server/sonar-server/src/test/resources/org/sonar/server/issue}/IssueStorageTest/should_update_issues.xml (98%) delete mode 100644 sonar-batch/src/main/java/org/sonar/batch/cpd/index/DbDuplicationsIndex.java delete mode 100644 sonar-batch/src/main/java/org/sonar/batch/issue/tracking/ServerIssueFromDb.java delete mode 100644 sonar-batch/src/test/java/org/sonar/batch/issue/tracking/IssueTrackingTest.java rename sonar-core/src/main/java/org/sonar/core/{resource => component}/DefaultResourceTypes.java (98%) delete mode 100644 sonar-core/src/main/java/org/sonar/core/component/db/package-info.java delete mode 100644 sonar-core/src/main/java/org/sonar/core/computation/db/package-info.java delete mode 100644 sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/package-info.java delete mode 100644 sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/period/package-info.java rename sonar-core/src/main/java/org/sonar/core/{computation/dbcleaner/DbCleanerConstants.java => config/PurgeConstants.java} (94%) rename sonar-core/src/main/java/org/sonar/core/{computation/dbcleaner/DataCleanerProperties.java => config/PurgeProperties.java} (85%) delete mode 100644 sonar-core/src/main/java/org/sonar/core/dashboard/package-info.java delete mode 100644 sonar-core/src/main/java/org/sonar/core/duplication/package-info.java delete mode 100644 sonar-core/src/main/java/org/sonar/core/measure/custom/db/package-info.java delete mode 100644 sonar-core/src/main/java/org/sonar/core/notification/db/package-info.java delete mode 100644 sonar-core/src/main/java/org/sonar/core/notification/package-info.java delete mode 100644 sonar-core/src/main/java/org/sonar/core/persistence/dialect/package-info.java delete mode 100644 sonar-core/src/main/java/org/sonar/core/persistence/migration/v44/package-info.java delete mode 100644 sonar-core/src/main/java/org/sonar/core/persistence/migration/v45/package-info.java delete mode 100644 sonar-core/src/main/java/org/sonar/core/persistence/migration/v50/package-info.java delete mode 100644 sonar-core/src/main/java/org/sonar/core/persistence/profiling/package-info.java rename sonar-core/src/main/java/org/sonar/core/{component => platform}/Module.java (94%) rename sonar-core/src/main/java/org/sonar/core/{plugins => platform}/RemotePlugin.java (97%) rename sonar-core/src/main/java/org/sonar/core/{plugins => platform}/RemotePluginFile.java (97%) delete mode 100644 sonar-core/src/main/java/org/sonar/core/qualitygate/db/package-info.java delete mode 100644 sonar-core/src/main/java/org/sonar/core/qualityprofile/db/package-info.java delete mode 100644 sonar-core/src/main/java/org/sonar/core/qualityprofile/package-info.java delete mode 100644 sonar-core/src/main/java/org/sonar/core/resource/package-info.java rename sonar-core/src/main/java/org/sonar/core/{event => rule}/package-info.java (97%) delete mode 100644 sonar-core/src/main/java/org/sonar/core/source/db/package-info.java delete mode 100644 sonar-core/src/main/java/org/sonar/core/technicaldebt/db/package-info.java delete mode 100644 sonar-core/src/main/java/org/sonar/core/technicaldebt/package-info.java rename sonar-core/src/main/java/org/sonar/core/{ => util}/UtcDateUtils.java (98%) rename sonar-core/src/test/java/org/sonar/core/{resource => component}/DefaultResourceTypesTest.java (98%) rename sonar-core/src/test/java/org/sonar/core/{computation/dbcleaner/DataCleanerPropertiesTest.java => config/PurgePropertiesTest.java} (87%) rename sonar-core/src/test/java/org/sonar/core/{component => platform}/ModuleTest.java (95%) rename sonar-core/src/test/java/org/sonar/core/{plugins => platform}/RemotePluginTest.java (98%) rename sonar-core/src/test/java/org/sonar/core/{ => util}/UtcDateUtilsTest.java (98%) delete mode 100644 sonar-core/src/test/resources/org/sonar/core/dashboard/ActiveDashboardDaoTest/shouldGetMaxOrderIndexForNullUser.xml delete mode 100644 sonar-core/src/test/resources/org/sonar/core/dashboard/ActiveDashboardDaoTest/shouldInsert-result.xml delete mode 100644 sonar-core/src/test/resources/org/sonar/core/dashboard/ActiveDashboardDaoTest/shouldInsertWithNoUser-result.xml delete mode 100644 sonar-core/src/test/resources/org/sonar/core/issue/db/ActionPlanDaoTest/shared.xml delete mode 100644 sonar-core/src/test/resources/org/sonar/core/issue/db/ActionPlanStatsDaoTest/shared.xml delete mode 100644 sonar-core/src/test/resources/org/sonar/core/issue/db/ActionPlanStatsDaoTest/should_find_by_project.xml delete mode 100644 sonar-core/src/test/resources/org/sonar/core/issue/db/IssueChangeDaoTest/selectChangelogOfNonClosedIssuesByComponent.xml delete mode 100644 sonar-core/src/test/resources/org/sonar/core/issue/db/IssueChangeDaoTest/shared.xml delete mode 100644 sonar-core/src/test/resources/org/sonar/core/issue/db/IssueChangeDaoTest/update-result.xml delete mode 100644 sonar-core/src/test/resources/org/sonar/core/issue/db/IssueChangeMapperTest/insert_comment-result.xml delete mode 100644 sonar-core/src/test/resources/org/sonar/core/issue/db/IssueChangeMapperTest/insert_diff-result.xml delete mode 100644 sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/find_severities_by_component.xml delete mode 100644 sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/shared.xml delete mode 100644 sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_issue_and_component_ids.xml delete mode 100644 sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_non_closed_issues_by_module.xml delete mode 100644 sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_non_closed_issues_by_module_on_removed_project.xml delete mode 100644 sonar-core/src/test/resources/org/sonar/core/issue/db/IssueFilterDaoTest/shared.xml delete mode 100644 sonar-core/src/test/resources/org/sonar/core/issue/db/IssueFilterDaoTest/should_delete-result.xml delete mode 100644 sonar-core/src/test/resources/org/sonar/core/issue/db/IssueFilterDaoTest/should_insert-result.xml delete mode 100644 sonar-core/src/test/resources/org/sonar/core/issue/db/IssueFilterDaoTest/should_select_by_user.xml delete mode 100644 sonar-core/src/test/resources/org/sonar/core/issue/db/IssueFilterDaoTest/should_select_by_user_with_only_favorite_filters.xml delete mode 100644 sonar-core/src/test/resources/org/sonar/core/issue/db/IssueFilterDaoTest/should_select_provided_by_name.xml delete mode 100644 sonar-core/src/test/resources/org/sonar/core/issue/db/IssueFilterDaoTest/should_update-result.xml delete mode 100644 sonar-core/src/test/resources/org/sonar/core/issue/db/IssueFilterFavouriteDaoTest/shared.xml delete mode 100644 sonar-core/src/test/resources/org/sonar/core/issue/db/IssueFilterFavouriteDaoTest/should_delete-result.xml delete mode 100644 sonar-core/src/test/resources/org/sonar/core/issue/db/IssueFilterFavouriteDaoTest/should_delete_by_issue_filter_id-result.xml delete mode 100644 sonar-core/src/test/resources/org/sonar/core/issue/db/IssueFilterFavouriteDaoTest/should_insert-result.xml delete mode 100644 sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/testInsert-result.xml delete mode 100644 sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/testUpdate-result.xml delete mode 100644 sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/testUpdate.xml delete mode 100644 sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/updateBeforeSelectedDate_with_conflict-result.xml delete mode 100644 sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/updateBeforeSelectedDate_with_conflict.xml delete mode 100644 sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStatsDaoTest/should_select_assignees.xml delete mode 100644 sonar-core/src/test/resources/org/sonar/core/metric/CacheMetricFinderTest/shared.xml delete mode 100644 sonar-core/src/test/resources/org/sonar/core/permission/PermissionTemplateDaoTest/createNonAsciiPermissionTemplate-result.xml delete mode 100644 sonar-core/src/test/resources/org/sonar/core/permission/PermissionTemplateDaoTest/createPermissionTemplate-result.xml delete mode 100644 sonar-core/src/test/resources/org/sonar/core/permission/PermissionTemplateDaoTest/deletePermissionTemplate-result.xml delete mode 100644 sonar-core/src/test/resources/org/sonar/core/permission/PermissionTemplateDaoTest/selectAllPermissionTemplates.xml delete mode 100644 sonar-core/src/test/resources/org/sonar/core/permission/PermissionTemplateDaoTest/selectEmptyPermissionTemplate.xml delete mode 100644 sonar-core/src/test/resources/org/sonar/core/permission/PermissionTemplateDaoTest/updatePermissionTemplate-result.xml delete mode 100644 sonar-core/src/test/resources/org/sonar/core/permission/PermissionTemplateDaoTest/updatePermissionTemplate.xml delete mode 100644 sonar-core/src/test/resources/org/sonar/core/persistence/PreviewDatabaseFactoryTest/multi-modules-with-issues.xml delete mode 100644 sonar-core/src/test/resources/org/sonar/core/persistence/PreviewDatabaseFactoryTest/should_copy_permission_templates.xml delete mode 100644 sonar-core/src/test/resources/org/sonar/core/persistence/PreviewDatabaseFactoryTest/should_create_database.xml delete mode 100644 sonar-core/src/test/resources/org/sonar/core/persistence/PreviewDatabaseFactoryTest/should_create_database_with_issues.xml delete mode 100644 sonar-core/src/test/resources/org/sonar/core/persistence/SemaphoreDaoTest/old_semaphore.xml rename sonar-core/src/test/resources/org/sonar/core/{plugins => platform}/sonar-checkstyle-plugin-2.8.jar (100%) delete mode 100644 sonar-core/src/test/resources/org/sonar/core/properties/PropertiesDaoTest/findNotificationSubscribers.xml delete mode 100644 sonar-core/src/test/resources/org/sonar/core/qualitygate/db/QualityGateConditionDaoTest/delete-result.xml delete mode 100644 sonar-core/src/test/resources/org/sonar/core/qualitygate/db/QualityGateConditionDaoTest/selectForQualityGate.xml delete mode 100644 sonar-core/src/test/resources/org/sonar/core/qualitygate/db/QualityGateConditionDaoTest/shouldCleanConditions.xml delete mode 100644 sonar-core/src/test/resources/org/sonar/core/qualitygate/db/QualityGateConditionDaoTest/update-result.xml delete mode 100644 sonar-core/src/test/resources/org/sonar/core/qualitygate/db/QualityGateDaoTest/delete-result.xml delete mode 100644 sonar-core/src/test/resources/org/sonar/core/qualitygate/db/QualityGateDaoTest/insert-result.xml delete mode 100644 sonar-core/src/test/resources/org/sonar/core/qualitygate/db/QualityGateDaoTest/selectAll.xml delete mode 100644 sonar-core/src/test/resources/org/sonar/core/qualitygate/db/QualityGateDaoTest/update-result.xml delete mode 100644 sonar-core/src/test/resources/org/sonar/core/qualitymodel/DefaultModelFinderTest/shared.xml delete mode 100644 sonar-core/src/test/resources/org/sonar/core/qualityprofile/db/ActiveRuleDaoTest/update-result.xml delete mode 100644 sonar-core/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantGroupRole.xml delete mode 100644 sonar-core/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantGroupRole_anyone-result.xml delete mode 100644 sonar-core/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantGroupRole_anyone.xml delete mode 100644 sonar-core/src/test/resources/org/sonar/core/resource/ResourceDaoTest/fixture.xml delete mode 100644 sonar-core/src/test/resources/org/sonar/core/resource/ResourceDaoTest/get_last_snapshot_by_component_uuid.xml delete mode 100644 sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/selectAll.xml delete mode 100644 sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/selectById.xml delete mode 100644 sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/selectNonManual.xml delete mode 100644 sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/selectParameters.xml delete mode 100644 sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/select_by_name.xml delete mode 100644 sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/select_by_rule_key.xml delete mode 100644 sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/select_parameters_by_rule_id.xml delete mode 100644 sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/select_parameters_by_rule_ids.xml delete mode 100644 sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/update-result.xml delete mode 100644 sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/update.xml delete mode 100644 sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/update_parameter-result.xml delete mode 100644 sonar-core/src/test/resources/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest/ignore_requirement_on_root_characteristics.xml delete mode 100644 sonar-core/src/test/resources/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest/import_characteristics.xml delete mode 100644 sonar-core/src/test/resources/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest/shouldImportXML_badly-formatted.xml delete mode 100644 sonar-core/src/test/resources/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest/shouldImportXML_with_deprecated_constant_per_file.xml delete mode 100644 sonar-core/src/test/resources/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest/shouldImportXML_with_deprecated_linear_with_threshold.xml delete mode 100644 sonar-core/src/test/resources/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest/shouldImportXML_with_linear.xml delete mode 100644 sonar-core/src/test/resources/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest/shouldImportXML_with_linear_with_offset.xml delete mode 100644 sonar-core/src/test/resources/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest/shouldLogWarningIfRuleNotFound.xml delete mode 100644 sonar-core/src/test/resources/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest/shouldRejectXML_with_invalid_value.xml delete mode 100644 sonar-core/src/test/resources/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest/use_default_unit_when_no_unit.xml delete mode 100644 sonar-core/src/test/resources/org/sonar/core/template/LoadedTemplateDaoTest/shouldInsert-result.xml delete mode 100644 sonar-core/src/test/resources/org/sonar/core/user/AuthorDaoTest/countDeveloperLogins.xml delete mode 100644 sonar-core/src/test/resources/org/sonar/core/user/AuthorDaoTest/shouldInsertAuthorAndDeveloper-result.xml delete mode 100644 sonar-core/src/test/resources/org/sonar/core/user/AuthorDaoTest/shouldPreventAuthorsAndDevelopersDuplication-result.xml delete mode 100644 sonar-core/src/test/resources/org/sonar/core/user/AuthorDaoTest/shouldPreventAuthorsAndDevelopersDuplication.xml delete mode 100644 sonar-core/src/test/resources/org/sonar/core/user/AuthorDaoTest/shouldPreventAuthorsDuplication-result.xml delete mode 100644 sonar-core/src/test/resources/org/sonar/core/user/AuthorDaoTest/shouldPreventAuthorsDuplication.xml delete mode 100644 sonar-core/src/test/resources/org/sonar/core/user/UserDaoTest/selectActiveUserByLogin.xml delete mode 100644 sonar-core/src/test/resources/org/sonar/core/user/UserDaoTest/selectUsersByLogins.xml delete mode 100644 sonar-core/src/test/resources/org/sonar/core/user/UserDaoTest/selectUsersByQuery.xml delete mode 100644 sonar-core/src/test/resources/org/sonar/core/user/UserDaoTest/selectUsersByText.xml create mode 100644 sonar-db/pom.xml rename {sonar-core => sonar-db}/src/main/java/org/sonar/batch/index/ResourceCopy.java (100%) rename {sonar-core => sonar-db}/src/main/java/org/sonar/core/issue/ActionPlanStats.java (97%) rename {sonar-core => sonar-db}/src/main/java/org/sonar/core/issue/db/package-info.java (99%) rename {sonar-core => sonar-db}/src/main/java/org/sonar/core/issue/package-info.java (99%) rename {sonar-core => sonar-db}/src/main/java/org/sonar/core/permission/ComponentPermissions.java (99%) rename {sonar-core => sonar-db}/src/main/java/org/sonar/core/permission/GlobalPermissions.java (99%) rename {sonar-core => sonar-db}/src/main/java/org/sonar/core/permission/GroupWithPermission.java (99%) rename {sonar-core => sonar-db}/src/main/java/org/sonar/core/permission/UserWithPermission.java (100%) rename {sonar-core => sonar-db}/src/main/java/org/sonar/core/permission/package-info.java (99%) rename {sonar-core => sonar-db}/src/main/java/org/sonar/core/timemachine/Periods.java (100%) rename {sonar-core/src/main/java/org/sonar/core/activity/db => sonar-db/src/main/java/org/sonar/core/timemachine}/package-info.java (96%) rename {sonar-core => sonar-db}/src/main/java/org/sonar/core/user/DefaultUserFinder.java (96%) rename {sonar-core => sonar-db}/src/main/java/org/sonar/core/user/DeprecatedUserFinder.java (96%) rename {sonar-core => sonar-db}/src/main/java/org/sonar/core/user/GroupMembership.java (99%) rename {sonar-core => sonar-db}/src/main/java/org/sonar/core/user/package-info.java (100%) rename {sonar-core/src/main/java/org/sonar/core/persistence => sonar-db/src/main/java/org/sonar/db}/BatchSession.java (97%) rename sonar-core/src/main/java/org/sonar/core/persistence/DaoComponent.java => sonar-db/src/main/java/org/sonar/db/Dao.java (92%) rename {sonar-core/src/main/java/org/sonar/core/persistence => sonar-db/src/main/java/org/sonar/db}/DaoUtils.java (74%) rename {sonar-core/src/main/java/org/sonar/core/persistence => sonar-db/src/main/java/org/sonar/db}/Database.java (93%) rename {sonar-core/src/main/java/org/sonar/core/persistence => sonar-db/src/main/java/org/sonar/db}/DatabaseUtils.java (98%) rename {sonar-core/src/main/java/org/sonar/core/persistence => sonar-db/src/main/java/org/sonar/db}/DbSession.java (97%) rename {sonar-core/src/main/java/org/sonar/core/persistence => sonar-db/src/main/java/org/sonar/db}/DdlUtils.java (90%) rename {sonar-core/src/main/java/org/sonar/core/persistence => sonar-db/src/main/java/org/sonar/db}/DefaultDatabase.java (96%) rename {sonar-core/src/main/java/org/sonar/core/persistence => sonar-db/src/main/java/org/sonar/db}/Dto.java (97%) rename {sonar-core/src/main/java/org/sonar/core/persistence => sonar-db/src/main/java/org/sonar/db}/IsAliveMapper.java (96%) rename {sonar-core/src/main/java/org/sonar/core/persistence => sonar-db/src/main/java/org/sonar/db}/MyBatis.java (63%) rename {sonar-core/src/main/java/org/sonar/core/activity/db => sonar-db/src/main/java/org/sonar/db/activity}/ActivityDto.java (98%) rename {sonar-core/src/main/java/org/sonar/core/activity/db => sonar-db/src/main/java/org/sonar/db/activity}/ActivityMapper.java (96%) rename {sonar-core/src/main/java/org/sonar/core/cluster => sonar-db/src/main/java/org/sonar/db/activity}/package-info.java (96%) rename {sonar-core/src/main/java/org/sonar/core => sonar-db/src/main/java/org/sonar/db}/component/ComponentDto.java (99%) rename {sonar-core/src/main/java/org/sonar/core/component/db => sonar-db/src/main/java/org/sonar/db/component}/ComponentIndexMapper.java (96%) rename {sonar-core/src/main/java/org/sonar/core => sonar-db/src/main/java/org/sonar/db}/component/ComponentLinkDto.java (98%) rename {sonar-core/src/main/java/org/sonar/core/component/db => sonar-db/src/main/java/org/sonar/db/component}/ComponentLinkMapper.java (92%) rename {sonar-core/src/main/java/org/sonar/core/component/db => sonar-db/src/main/java/org/sonar/db/component}/ComponentMapper.java (95%) rename {sonar-core/src/main/java/org/sonar/core => sonar-db/src/main/java/org/sonar/db}/component/FilePathWithHashDto.java (97%) rename {sonar-core/src/main/java/org/sonar/core/resource => sonar-db/src/main/java/org/sonar/db/component}/ResourceDao.java (97%) rename {sonar-core/src/main/java/org/sonar/core/resource => sonar-db/src/main/java/org/sonar/db/component}/ResourceDto.java (99%) rename {sonar-core/src/main/java/org/sonar/core/resource => sonar-db/src/main/java/org/sonar/db/component}/ResourceIndexDto.java (98%) rename {sonar-core/src/main/java/org/sonar/core/resource => sonar-db/src/main/java/org/sonar/db/component}/ResourceIndexerDao.java (95%) rename {sonar-core/src/main/java/org/sonar/core/resource => sonar-db/src/main/java/org/sonar/db/component}/ResourceIndexerMapper.java (97%) rename {sonar-core/src/main/java/org/sonar/core/resource => sonar-db/src/main/java/org/sonar/db/component}/ResourceIndexerQuery.java (96%) rename {sonar-core/src/main/java/org/sonar/core/resource => sonar-db/src/main/java/org/sonar/db/component}/ResourceKeyUpdaterDao.java (98%) rename {sonar-core/src/main/java/org/sonar/core/resource => sonar-db/src/main/java/org/sonar/db/component}/ResourceKeyUpdaterMapper.java (97%) rename {sonar-core/src/main/java/org/sonar/core/resource => sonar-db/src/main/java/org/sonar/db/component}/ResourceMapper.java (97%) rename {sonar-core/src/main/java/org/sonar/core/resource => sonar-db/src/main/java/org/sonar/db/component}/ResourceQuery.java (98%) rename {sonar-core/src/main/java/org/sonar/core => sonar-db/src/main/java/org/sonar/db}/component/SnapshotDto.java (99%) rename {sonar-core/src/main/java/org/sonar/core/component/db => sonar-db/src/main/java/org/sonar/db/component}/SnapshotMapper.java (96%) rename {sonar-core/src/main/java/org/sonar/core/component/db => sonar-db/src/main/java/org/sonar/db/component}/SnapshotQuery.java (98%) rename {sonar-core/src/main/java/org/sonar/core => sonar-db/src/main/java/org/sonar/db}/component/UuidWithProjectUuidDto.java (97%) rename {sonar-core/src/main/java/org/sonar/core/plugins => sonar-db/src/main/java/org/sonar/db/component}/package-info.java (96%) rename {sonar-core/src/main/java/org/sonar/core/computation/db => sonar-db/src/main/java/org/sonar/db/compute}/AnalysisReportDto.java (98%) rename {sonar-core/src/main/java/org/sonar/core/computation/db => sonar-db/src/main/java/org/sonar/db/compute}/AnalysisReportMapper.java (97%) create mode 100644 sonar-db/src/main/java/org/sonar/db/compute/package-info.java rename {sonar-core/src/main/java/org/sonar/core => sonar-db/src/main/java/org/sonar/db}/dashboard/ActiveDashboardDao.java (93%) rename {sonar-core/src/main/java/org/sonar/core => sonar-db/src/main/java/org/sonar/db}/dashboard/ActiveDashboardDto.java (98%) rename {sonar-core/src/main/java/org/sonar/core => sonar-db/src/main/java/org/sonar/db}/dashboard/ActiveDashboardMapper.java (97%) rename {sonar-core/src/main/java/org/sonar/core => sonar-db/src/main/java/org/sonar/db}/dashboard/DashboardDao.java (88%) rename {sonar-core/src/main/java/org/sonar/core => sonar-db/src/main/java/org/sonar/db}/dashboard/DashboardDto.java (97%) rename {sonar-core/src/main/java/org/sonar/core => sonar-db/src/main/java/org/sonar/db}/dashboard/DashboardMapper.java (98%) rename {sonar-core/src/main/java/org/sonar/core => sonar-db/src/main/java/org/sonar/db}/dashboard/WidgetDto.java (99%) rename {sonar-core/src/main/java/org/sonar/core => sonar-db/src/main/java/org/sonar/db}/dashboard/WidgetMapper.java (98%) rename {sonar-core/src/main/java/org/sonar/core => sonar-db/src/main/java/org/sonar/db}/dashboard/WidgetPropertyDto.java (98%) rename {sonar-core/src/main/java/org/sonar/core => sonar-db/src/main/java/org/sonar/db}/dashboard/WidgetPropertyMapper.java (98%) create mode 100644 sonar-db/src/main/java/org/sonar/db/dashboard/package-info.java rename {sonar-core/src/main/java/org/sonar/core/technicaldebt/db => sonar-db/src/main/java/org/sonar/db/debt}/CharacteristicDao.java (95%) rename {sonar-core/src/main/java/org/sonar/core/technicaldebt/db => sonar-db/src/main/java/org/sonar/db/debt}/CharacteristicDto.java (98%) rename {sonar-core/src/main/java/org/sonar/core/technicaldebt/db => sonar-db/src/main/java/org/sonar/db/debt}/CharacteristicMapper.java (97%) rename {sonar-core/src/main/java/org/sonar/core/technicaldebt/db => sonar-db/src/main/java/org/sonar/db/debt}/RequirementMigrationDto.java (98%) rename {sonar-core/src/main/java/org/sonar/core/purge => sonar-db/src/main/java/org/sonar/db/debt}/package-info.java (97%) rename {sonar-core/src/main/java/org/sonar/core/cluster => sonar-db/src/main/java/org/sonar/db/deprecated}/ClusterAction.java (96%) rename {sonar-core/src/main/java/org/sonar/core/cluster => sonar-db/src/main/java/org/sonar/db/deprecated}/NullQueue.java (96%) rename {sonar-core/src/main/java/org/sonar/core/cluster => sonar-db/src/main/java/org/sonar/db/deprecated}/WorkQueue.java (96%) rename {sonar-core/src/main/java/org/sonar/core/persistence => sonar-db/src/main/java/org/sonar/db}/dialect/AbstractDialect.java (96%) rename {sonar-core/src/main/java/org/sonar/core/persistence => sonar-db/src/main/java/org/sonar/db}/dialect/Dialect.java (98%) rename {sonar-core/src/main/java/org/sonar/core/persistence => sonar-db/src/main/java/org/sonar/db}/dialect/DialectUtils.java (98%) rename {sonar-core/src/main/java/org/sonar/core/persistence => sonar-db/src/main/java/org/sonar/db}/dialect/H2.java (96%) rename {sonar-core/src/main/java/org/sonar/core/persistence => sonar-db/src/main/java/org/sonar/db}/dialect/MsSql.java (97%) rename {sonar-core/src/main/java/org/sonar/core/persistence => sonar-db/src/main/java/org/sonar/db}/dialect/MySql.java (97%) rename {sonar-core/src/main/java/org/sonar/core/persistence => sonar-db/src/main/java/org/sonar/db}/dialect/Oracle.java (96%) rename {sonar-core/src/main/java/org/sonar/core/persistence => sonar-db/src/main/java/org/sonar/db}/dialect/PostgreSql.java (97%) create mode 100644 sonar-db/src/main/java/org/sonar/db/dialect/package-info.java rename {sonar-core/src/main/java/org/sonar/core => sonar-db/src/main/java/org/sonar/db}/duplication/DuplicationDao.java (89%) rename {sonar-core/src/main/java/org/sonar/core => sonar-db/src/main/java/org/sonar/db}/duplication/DuplicationMapper.java (83%) rename {sonar-core/src/main/java/org/sonar/core => sonar-db/src/main/java/org/sonar/db}/duplication/DuplicationUnitDto.java (98%) create mode 100644 sonar-db/src/main/java/org/sonar/db/duplication/package-info.java rename {sonar-core/src/main/java/org/sonar/core => sonar-db/src/main/java/org/sonar/db}/event/EventDto.java (98%) rename {sonar-core/src/main/java/org/sonar/core/event/db => sonar-db/src/main/java/org/sonar/db/event}/EventMapper.java (94%) create mode 100644 sonar-db/src/main/java/org/sonar/db/event/package-info.java rename {sonar-core/src/main/java/org/sonar/core/issue/db => sonar-db/src/main/java/org/sonar/db/issue}/ActionPlanDao.java (95%) rename {sonar-core/src/main/java/org/sonar/core/issue/db => sonar-db/src/main/java/org/sonar/db/issue}/ActionPlanDto.java (91%) rename {sonar-core/src/main/java/org/sonar/core/issue/db => sonar-db/src/main/java/org/sonar/db/issue}/ActionPlanMapper.java (97%) rename {sonar-core/src/main/java/org/sonar/core/issue/db => sonar-db/src/main/java/org/sonar/db/issue}/ActionPlanStatsDao.java (87%) rename {sonar-core/src/main/java/org/sonar/core/issue/db => sonar-db/src/main/java/org/sonar/db/issue}/ActionPlanStatsDto.java (90%) rename {sonar-core/src/main/java/org/sonar/core/issue/db => sonar-db/src/main/java/org/sonar/db/issue}/ActionPlanStatsMapper.java (97%) rename {sonar-core/src/main/java/org/sonar/core/issue/db => sonar-db/src/main/java/org/sonar/db/issue}/IssueChangeDao.java (95%) rename {sonar-core/src/main/java/org/sonar/core/issue/db => sonar-db/src/main/java/org/sonar/db/issue}/IssueChangeDto.java (99%) rename {sonar-core/src/main/java/org/sonar/core/issue/db => sonar-db/src/main/java/org/sonar/db/issue}/IssueChangeMapper.java (97%) rename {sonar-core/src/main/java/org/sonar/core/issue/db => sonar-db/src/main/java/org/sonar/db/issue}/IssueDao.java (80%) rename {sonar-core/src/main/java/org/sonar/core/issue/db => sonar-db/src/main/java/org/sonar/db/issue}/IssueDto.java (94%) rename {sonar-core/src/main/java/org/sonar/core/issue/db => sonar-db/src/main/java/org/sonar/db/issue}/IssueFilterDao.java (91%) rename {sonar-core/src/main/java/org/sonar/core/issue/db => sonar-db/src/main/java/org/sonar/db/issue}/IssueFilterDto.java (98%) rename {sonar-core/src/main/java/org/sonar/core/issue/db => sonar-db/src/main/java/org/sonar/db/issue}/IssueFilterFavouriteDao.java (92%) rename {sonar-core/src/main/java/org/sonar/core/issue/db => sonar-db/src/main/java/org/sonar/db/issue}/IssueFilterFavouriteDto.java (98%) rename {sonar-core/src/main/java/org/sonar/core/issue/db => sonar-db/src/main/java/org/sonar/db/issue}/IssueFilterFavouriteMapper.java (97%) rename {sonar-core/src/main/java/org/sonar/core/issue/db => sonar-db/src/main/java/org/sonar/db/issue}/IssueFilterMapper.java (97%) rename {sonar-core/src/main/java/org/sonar/core/issue/db => sonar-db/src/main/java/org/sonar/db/issue}/IssueMapper.java (97%) create mode 100644 sonar-db/src/main/java/org/sonar/db/issue/package-info.java rename {sonar-core/src/main/java/org/sonar/core/template => sonar-db/src/main/java/org/sonar/db/loadedtemplate}/LoadedTemplateDao.java (85%) rename {sonar-core/src/main/java/org/sonar/core/template => sonar-db/src/main/java/org/sonar/db/loadedtemplate}/LoadedTemplateDto.java (98%) rename {sonar-core/src/main/java/org/sonar/core/template => sonar-db/src/main/java/org/sonar/db/loadedtemplate}/LoadedTemplateMapper.java (96%) create mode 100644 sonar-db/src/main/java/org/sonar/db/loadedtemplate/package-info.java rename {sonar-core/src/main/java/org/sonar/core/measure/custom/db => sonar-db/src/main/java/org/sonar/db/measure}/CustomMeasureDto.java (98%) rename {sonar-core/src/main/java/org/sonar/core/measure/custom/db => sonar-db/src/main/java/org/sonar/db/measure}/CustomMeasureMapper.java (97%) rename {sonar-core/src/main/java/org/sonar/core/measure/db => sonar-db/src/main/java/org/sonar/db/measure}/MeasureDto.java (99%) rename {sonar-core/src/main/java/org/sonar/core/measure/db => sonar-db/src/main/java/org/sonar/db/measure}/MeasureFilterDao.java (89%) rename {sonar-core/src/main/java/org/sonar/core/measure/db => sonar-db/src/main/java/org/sonar/db/measure}/MeasureFilterDto.java (98%) rename {sonar-core/src/main/java/org/sonar/core/measure/db => sonar-db/src/main/java/org/sonar/db/measure}/MeasureFilterMapper.java (96%) rename {sonar-core/src/main/java/org/sonar/core/measure/db => sonar-db/src/main/java/org/sonar/db/measure}/MeasureMapper.java (98%) rename {sonar-core/src/main/java/org/sonar/core/measure/db => sonar-db/src/main/java/org/sonar/db/measure}/PastMeasureDto.java (98%) create mode 100644 sonar-db/src/main/java/org/sonar/db/measure/package-info.java rename {sonar-core/src/main/java/org/sonar/core/metric/db => sonar-db/src/main/java/org/sonar/db/metric}/MetricDto.java (99%) rename {sonar-core/src/main/java/org/sonar/core/metric/db => sonar-db/src/main/java/org/sonar/db/metric}/MetricMapper.java (98%) create mode 100644 sonar-db/src/main/java/org/sonar/db/metric/package-info.java rename {sonar-core/src/main/java/org/sonar/core/notification/db => sonar-db/src/main/java/org/sonar/db/notification}/NotificationQueueDao.java (90%) rename {sonar-core/src/main/java/org/sonar/core/notification/db => sonar-db/src/main/java/org/sonar/db/notification}/NotificationQueueDto.java (98%) rename {sonar-core/src/main/java/org/sonar/core/notification/db => sonar-db/src/main/java/org/sonar/db/notification}/NotificationQueueMapper.java (96%) create mode 100644 sonar-db/src/main/java/org/sonar/db/notification/package-info.java create mode 100644 sonar-db/src/main/java/org/sonar/db/package-info.java rename {sonar-core/src/main/java/org/sonar/core => sonar-db/src/main/java/org/sonar/db}/permission/GroupWithPermissionDto.java (95%) rename {sonar-core/src/main/java/org/sonar/core => sonar-db/src/main/java/org/sonar/db}/permission/PermissionDao.java (97%) rename {sonar-core/src/main/java/org/sonar/core => sonar-db/src/main/java/org/sonar/db}/permission/PermissionFacade.java (96%) rename {sonar-core/src/main/java/org/sonar/core => sonar-db/src/main/java/org/sonar/db}/permission/PermissionMapper.java (97%) rename {sonar-core/src/main/java/org/sonar/core => sonar-db/src/main/java/org/sonar/db}/permission/PermissionQuery.java (99%) rename {sonar-core/src/main/java/org/sonar/core => sonar-db/src/main/java/org/sonar/db}/permission/PermissionTemplateDao.java (96%) rename {sonar-core/src/main/java/org/sonar/core => sonar-db/src/main/java/org/sonar/db}/permission/PermissionTemplateDto.java (98%) rename {sonar-core/src/main/java/org/sonar/core => sonar-db/src/main/java/org/sonar/db}/permission/PermissionTemplateGroupDto.java (98%) rename {sonar-core/src/main/java/org/sonar/core => sonar-db/src/main/java/org/sonar/db}/permission/PermissionTemplateMapper.java (98%) rename {sonar-core/src/main/java/org/sonar/core => sonar-db/src/main/java/org/sonar/db}/permission/PermissionTemplateUserDto.java (98%) rename {sonar-core/src/main/java/org/sonar/core => sonar-db/src/main/java/org/sonar/db}/permission/UserWithPermissionDto.java (95%) rename {sonar-core/src/main/java/org/sonar/core/event/db => sonar-db/src/main/java/org/sonar/db/permission}/package-info.java (96%) rename {sonar-core/src/main/java/org/sonar/core/persistence => sonar-db/src/main/java/org/sonar/db}/profiling/InvocationUtils.java (89%) rename {sonar-core/src/main/java/org/sonar/core/persistence => sonar-db/src/main/java/org/sonar/db}/profiling/ProfiledDataSource.java (97%) rename {sonar-core/src/main/java/org/sonar/core/persistence => sonar-db/src/main/java/org/sonar/db}/profiling/ProfilingConnectionHandler.java (92%) rename {sonar-core/src/main/java/org/sonar/core/persistence => sonar-db/src/main/java/org/sonar/db}/profiling/ProfilingPreparedStatementHandler.java (98%) rename {sonar-core/src/main/java/org/sonar/core/persistence => sonar-db/src/main/java/org/sonar/db}/profiling/ProfilingStatementHandler.java (93%) create mode 100644 sonar-db/src/main/java/org/sonar/db/profiling/package-info.java rename {sonar-core/src/main/java/org/sonar/core/properties => sonar-db/src/main/java/org/sonar/db/property}/PropertiesDao.java (95%) rename {sonar-core/src/main/java/org/sonar/core/properties => sonar-db/src/main/java/org/sonar/db/property}/PropertiesMapper.java (94%) rename {sonar-core/src/main/java/org/sonar/core/properties => sonar-db/src/main/java/org/sonar/db/property}/PropertyDto.java (98%) rename {sonar-core/src/main/java/org/sonar/core/properties => sonar-db/src/main/java/org/sonar/db/property}/PropertyQuery.java (98%) rename {sonar-core/src/main/java/org/sonar/core => sonar-db/src/main/java/org/sonar/db}/purge/IdUuidPair.java (97%) rename {sonar-core/src/main/java/org/sonar/core => sonar-db/src/main/java/org/sonar/db}/purge/IdUuidPairs.java (98%) rename {sonar-core/src/main/java/org/sonar/core => sonar-db/src/main/java/org/sonar/db}/purge/PurgeCommands.java (99%) rename {sonar-core/src/main/java/org/sonar/core => sonar-db/src/main/java/org/sonar/db}/purge/PurgeConfiguration.java (88%) rename {sonar-core/src/main/java/org/sonar/core => sonar-db/src/main/java/org/sonar/db}/purge/PurgeDao.java (95%) rename {sonar-core/src/main/java/org/sonar/core => sonar-db/src/main/java/org/sonar/db}/purge/PurgeListener.java (97%) rename {sonar-core/src/main/java/org/sonar/core => sonar-db/src/main/java/org/sonar/db}/purge/PurgeMapper.java (99%) rename {sonar-core/src/main/java/org/sonar/core => sonar-db/src/main/java/org/sonar/db}/purge/PurgeProfiler.java (96%) rename {sonar-core/src/main/java/org/sonar/core => sonar-db/src/main/java/org/sonar/db}/purge/PurgeSnapshotQuery.java (80%) rename {sonar-core/src/main/java/org/sonar/core => sonar-db/src/main/java/org/sonar/db}/purge/PurgeableSnapshotDto.java (98%) create mode 100644 sonar-db/src/main/java/org/sonar/db/purge/package-info.java rename {sonar-core/src/main/java/org/sonar/core/computation/dbcleaner => sonar-db/src/main/java/org/sonar/db/purge}/period/DefaultPeriodCleaner.java (91%) rename {sonar-core/src/main/java/org/sonar/core/computation/dbcleaner => sonar-db/src/main/java/org/sonar/db/purge}/period/DeleteAllFilter.java (94%) rename {sonar-core/src/main/java/org/sonar/core/computation/dbcleaner => sonar-db/src/main/java/org/sonar/db/purge}/period/Filter.java (90%) rename {sonar-core/src/main/java/org/sonar/core/computation/dbcleaner => sonar-db/src/main/java/org/sonar/db/purge}/period/Filters.java (84%) rename {sonar-core/src/main/java/org/sonar/core/computation/dbcleaner => sonar-db/src/main/java/org/sonar/db/purge}/period/Interval.java (92%) rename {sonar-core/src/main/java/org/sonar/core/computation/dbcleaner => sonar-db/src/main/java/org/sonar/db/purge}/period/KeepOneFilter.java (96%) rename {sonar-core/src/main/java/org/sonar/core/measure/db => sonar-db/src/main/java/org/sonar/db/purge/period}/package-info.java (96%) rename {sonar-core/src/main/java/org/sonar/core/qualitygate/db => sonar-db/src/main/java/org/sonar/db/qualitygate}/ProjectQgateAssociation.java (98%) rename {sonar-core/src/main/java/org/sonar/core/qualitygate/db => sonar-db/src/main/java/org/sonar/db/qualitygate}/ProjectQgateAssociationDao.java (96%) rename {sonar-core/src/main/java/org/sonar/core/qualitygate/db => sonar-db/src/main/java/org/sonar/db/qualitygate}/ProjectQgateAssociationDto.java (97%) rename {sonar-core/src/main/java/org/sonar/core/qualitygate/db => sonar-db/src/main/java/org/sonar/db/qualitygate}/ProjectQgateAssociationMapper.java (96%) rename {sonar-core/src/main/java/org/sonar/core/qualitygate/db => sonar-db/src/main/java/org/sonar/db/qualitygate}/ProjectQgateAssociationQuery.java (99%) rename {sonar-core/src/main/java/org/sonar/core/qualitygate/db => sonar-db/src/main/java/org/sonar/db/qualitygate}/QualityGateConditionDao.java (94%) rename {sonar-core/src/main/java/org/sonar/core/qualitygate/db => sonar-db/src/main/java/org/sonar/db/qualitygate}/QualityGateConditionDto.java (99%) rename {sonar-core/src/main/java/org/sonar/core/qualitygate/db => sonar-db/src/main/java/org/sonar/db/qualitygate}/QualityGateConditionMapper.java (96%) rename {sonar-core/src/main/java/org/sonar/core/qualitygate/db => sonar-db/src/main/java/org/sonar/db/qualitygate}/QualityGateDao.java (97%) rename {sonar-core/src/main/java/org/sonar/core/qualitygate/db => sonar-db/src/main/java/org/sonar/db/qualitygate}/QualityGateDto.java (97%) rename {sonar-core/src/main/java/org/sonar/core/qualitygate/db => sonar-db/src/main/java/org/sonar/db/qualitygate}/QualityGateMapper.java (96%) rename {sonar-core/src/main/java/org/sonar/core/qualityprofile/db => sonar-db/src/main/java/org/sonar/db/qualityprofile}/ActiveRuleDao.java (94%) rename {sonar-core/src/main/java/org/sonar/core/qualityprofile/db => sonar-db/src/main/java/org/sonar/db/qualityprofile}/ActiveRuleDto.java (97%) rename {sonar-core/src/main/java/org/sonar/core/qualityprofile/db => sonar-db/src/main/java/org/sonar/db/qualityprofile}/ActiveRuleKey.java (98%) rename {sonar-core/src/main/java/org/sonar/core/qualityprofile/db => sonar-db/src/main/java/org/sonar/db/qualityprofile}/ActiveRuleMapper.java (93%) rename {sonar-core/src/main/java/org/sonar/core/qualityprofile/db => sonar-db/src/main/java/org/sonar/db/qualityprofile}/ActiveRuleParamDto.java (93%) rename {sonar-core/src/main/java/org/sonar/core/qualityprofile/db => sonar-db/src/main/java/org/sonar/db/qualityprofile}/ProjectQprofileAssociationDto.java (97%) rename {sonar-core/src/main/java/org/sonar/core/qualityprofile/db => sonar-db/src/main/java/org/sonar/db/qualityprofile}/QualityProfileDao.java (94%) rename {sonar-core/src/main/java/org/sonar/core/qualityprofile/db => sonar-db/src/main/java/org/sonar/db/qualityprofile}/QualityProfileDto.java (95%) rename {sonar-core/src/main/java/org/sonar/core/qualityprofile/db => sonar-db/src/main/java/org/sonar/db/qualityprofile}/QualityProfileMapper.java (97%) rename {sonar-core/src/main/java/org/sonar/core/qualityprofile/db => sonar-db/src/main/java/org/sonar/db/qualityprofile}/QualityProfileProjectCount.java (96%) rename {sonar-core/src/main/java/org/sonar/core => sonar-db/src/main/java/org/sonar/db}/rule/RuleDao.java (91%) rename {sonar-core/src/main/java/org/sonar/core => sonar-db/src/main/java/org/sonar/db}/rule/RuleDto.java (99%) rename {sonar-core/src/main/java/org/sonar/core => sonar-db/src/main/java/org/sonar/db}/rule/RuleMapper.java (98%) rename {sonar-core/src/main/java/org/sonar/core => sonar-db/src/main/java/org/sonar/db}/rule/RuleParamDto.java (98%) rename {sonar-core/src/main/java/org/sonar/core/persistence => sonar-db/src/main/java/org/sonar/db/semaphore}/SemaphoreDao.java (98%) rename {sonar-core/src/main/java/org/sonar/core/persistence => sonar-db/src/main/java/org/sonar/db/semaphore}/SemaphoreDto.java (98%) rename {sonar-core/src/main/java/org/sonar/core/persistence => sonar-db/src/main/java/org/sonar/db/semaphore}/SemaphoreMapper.java (97%) rename {sonar-core/src/main/java/org/sonar/core/persistence => sonar-db/src/main/java/org/sonar/db/semaphore}/SemaphoreUpdater.java (98%) rename {sonar-core/src/main/java/org/sonar/core/persistence => sonar-db/src/main/java/org/sonar/db/semaphore}/SemaphoresImpl.java (97%) create mode 100644 sonar-db/src/main/java/org/sonar/db/semaphore/package-info.java rename {sonar-core/src/main/java/org/sonar/core/source/db => sonar-db/src/main/java/org/sonar/db/source}/FileSourceDto.java (99%) rename {sonar-core/src/main/java/org/sonar/core/source/db => sonar-db/src/main/java/org/sonar/db/source}/FileSourceMapper.java (97%) rename {sonar-core/src/main/java/org/sonar/core => sonar-db/src/main/java/org/sonar/db}/user/AuthorDao.java (89%) rename {sonar-core/src/main/java/org/sonar/core => sonar-db/src/main/java/org/sonar/db}/user/AuthorDto.java (88%) rename {sonar-core/src/main/java/org/sonar/core => sonar-db/src/main/java/org/sonar/db}/user/AuthorMapper.java (97%) rename {sonar-core/src/main/java/org/sonar/core => sonar-db/src/main/java/org/sonar/db}/user/AuthorizationDao.java (94%) rename {sonar-core/src/main/java/org/sonar/core => sonar-db/src/main/java/org/sonar/db}/user/AuthorizationMapper.java (98%) rename {sonar-core/src/main/java/org/sonar/core => sonar-db/src/main/java/org/sonar/db}/user/GroupDto.java (95%) rename {sonar-core/src/main/java/org/sonar/core => sonar-db/src/main/java/org/sonar/db}/user/GroupMapper.java (97%) rename {sonar-core/src/main/java/org/sonar/core => sonar-db/src/main/java/org/sonar/db}/user/GroupMembershipDao.java (94%) rename {sonar-core/src/main/java/org/sonar/core => sonar-db/src/main/java/org/sonar/db}/user/GroupMembershipDto.java (96%) rename {sonar-core/src/main/java/org/sonar/core => sonar-db/src/main/java/org/sonar/db}/user/GroupMembershipMapper.java (98%) rename {sonar-core/src/main/java/org/sonar/core => sonar-db/src/main/java/org/sonar/db}/user/GroupMembershipQuery.java (99%) rename {sonar-core/src/main/java/org/sonar/core => sonar-db/src/main/java/org/sonar/db}/user/GroupRoleDto.java (98%) rename {sonar-core/src/main/java/org/sonar/core => sonar-db/src/main/java/org/sonar/db}/user/GroupUserCount.java (97%) rename {sonar-core/src/main/java/org/sonar/core => sonar-db/src/main/java/org/sonar/db}/user/LoginGroup.java (97%) rename {sonar-core/src/main/java/org/sonar/core => sonar-db/src/main/java/org/sonar/db}/user/RoleDao.java (91%) rename {sonar-core/src/main/java/org/sonar/core => sonar-db/src/main/java/org/sonar/db}/user/RoleMapper.java (98%) rename {sonar-core/src/main/java/org/sonar/core => sonar-db/src/main/java/org/sonar/db}/user/UserDao.java (93%) rename {sonar-core/src/main/java/org/sonar/core => sonar-db/src/main/java/org/sonar/db}/user/UserDto.java (98%) rename {sonar-core/src/main/java/org/sonar/core => sonar-db/src/main/java/org/sonar/db}/user/UserGroupDto.java (97%) rename {sonar-core/src/main/java/org/sonar/core => sonar-db/src/main/java/org/sonar/db}/user/UserGroupMapper.java (97%) rename {sonar-core/src/main/java/org/sonar/core => sonar-db/src/main/java/org/sonar/db}/user/UserMapper.java (98%) rename {sonar-core/src/main/java/org/sonar/core => sonar-db/src/main/java/org/sonar/db}/user/UserMembershipDto.java (98%) rename {sonar-core/src/main/java/org/sonar/core => sonar-db/src/main/java/org/sonar/db}/user/UserMembershipQuery.java (99%) rename {sonar-core/src/main/java/org/sonar/core => sonar-db/src/main/java/org/sonar/db}/user/UserRoleDto.java (98%) rename {sonar-core/src/main/java/org/sonar/core/persistence => sonar-db/src/main/java/org/sonar/db/version}/DatabaseVersion.java (95%) rename {sonar-core/src/main/java/org/sonar/core/persistence => sonar-db/src/main/java/org/sonar/db/version}/SchemaMigrationDto.java (91%) rename {sonar-core/src/main/java/org/sonar/core/persistence => sonar-db/src/main/java/org/sonar/db/version}/SchemaMigrationMapper.java (96%) create mode 100644 sonar-db/src/main/java/org/sonar/db/version/package-info.java rename {sonar-core/src/main/java/org/sonar/core/persistence/migration => sonar-db/src/main/java/org/sonar/db/version}/v44/ChangeLog.java (98%) rename {sonar-core/src/main/java/org/sonar/core/persistence/migration => sonar-db/src/main/java/org/sonar/db/version}/v44/Migration44Mapper.java (97%) rename {sonar-core/src/main/java/org/sonar/core/persistence/migration => sonar-db/src/main/java/org/sonar/db/version}/v44/ProfileMeasure.java (96%) rename {sonar-core/src/main/java/org/sonar/core/persistence/migration => sonar-db/src/main/java/org/sonar/db/version}/v44/QProfileDto44.java (96%) rename {sonar-core/src/main/java/org/sonar/core/metric/db => sonar-db/src/main/java/org/sonar/db/version/v44}/package-info.java (96%) rename {sonar-core/src/main/java/org/sonar/core/persistence/migration => sonar-db/src/main/java/org/sonar/db/version}/v45/Migration45Mapper.java (98%) rename {sonar-core/src/main/java/org/sonar/core/persistence/migration => sonar-db/src/main/java/org/sonar/db/version}/v45/Rule.java (98%) rename {sonar-core/src/main/java/org/sonar/core/persistence/migration => sonar-db/src/main/java/org/sonar/db/version}/v45/RuleParameter.java (98%) create mode 100644 sonar-db/src/main/java/org/sonar/db/version/v45/package-info.java rename {sonar-core/src/main/java/org/sonar/core/persistence/migration => sonar-db/src/main/java/org/sonar/db/version}/v50/Component.java (98%) rename {sonar-core/src/main/java/org/sonar/core/persistence/migration => sonar-db/src/main/java/org/sonar/db/version}/v50/Migration50Mapper.java (98%) create mode 100644 sonar-db/src/main/java/org/sonar/db/version/v50/package-info.java rename {sonar-core/src/main/resources/org/sonar/core/persistence => sonar-db/src/main/resources/org/sonar/db}/IsAliveMapper.xml (73%) rename {sonar-core/src/main/resources/org/sonar/core/activity/db => sonar-db/src/main/resources/org/sonar/db/activity}/ActivityMapper.xml (90%) rename {sonar-core/src/main/resources/org/sonar/core/component/db => sonar-db/src/main/resources/org/sonar/db/component}/ComponentIndexMapper.xml (88%) rename {sonar-core/src/main/resources/org/sonar/core/component/db => sonar-db/src/main/resources/org/sonar/db/component}/ComponentLinkMapper.xml (81%) rename {sonar-core/src/main/resources/org/sonar/core/component/db => sonar-db/src/main/resources/org/sonar/db/component}/ComponentMapper.xml (78%) rename {sonar-core/src/main/resources/org/sonar/core/resource => sonar-db/src/main/resources/org/sonar/db/component}/ResourceIndexerMapper.xml (97%) rename {sonar-core/src/main/resources/org/sonar/core/resource => sonar-db/src/main/resources/org/sonar/db/component}/ResourceKeyUpdaterMapper.xml (94%) rename {sonar-core/src/main/resources/org/sonar/core/resource => sonar-db/src/main/resources/org/sonar/db/component}/ResourceMapper.xml (81%) rename {sonar-core/src/main/resources/org/sonar/core/component/db => sonar-db/src/main/resources/org/sonar/db/component}/SnapshotMapper.xml (98%) rename {sonar-core/src/main/resources/org/sonar/core/computation/db => sonar-db/src/main/resources/org/sonar/db/compute}/AnalysisReportMapper.xml (95%) rename {sonar-core/src/main/resources/org/sonar/core => sonar-db/src/main/resources/org/sonar/db}/dashboard/ActiveDashboardMapper.xml (82%) rename {sonar-core/src/main/resources/org/sonar/core => sonar-db/src/main/resources/org/sonar/db}/dashboard/DashboardMapper.xml (72%) rename {sonar-core/src/main/resources/org/sonar/core => sonar-db/src/main/resources/org/sonar/db}/dashboard/WidgetMapper.xml (72%) rename {sonar-core/src/main/resources/org/sonar/core => sonar-db/src/main/resources/org/sonar/db}/dashboard/WidgetPropertyMapper.xml (72%) rename {sonar-core/src/main/resources/org/sonar/core/technicaldebt/db => sonar-db/src/main/resources/org/sonar/db/debt}/CharacteristicMapper.xml (80%) rename {sonar-core/src/main/resources/org/sonar/core => sonar-db/src/main/resources/org/sonar/db}/duplication/DuplicationMapper.xml (84%) rename {sonar-core/src/main/resources/org/sonar/core/event/db => sonar-db/src/main/resources/org/sonar/db/event}/EventMapper.xml (83%) rename {sonar-core/src/main/resources/org/sonar/core/issue/db => sonar-db/src/main/resources/org/sonar/db/issue}/ActionPlanMapper.xml (85%) rename {sonar-core/src/main/resources/org/sonar/core/issue/db => sonar-db/src/main/resources/org/sonar/db/issue}/ActionPlanStatsMapper.xml (77%) rename {sonar-core/src/main/resources/org/sonar/core/issue/db => sonar-db/src/main/resources/org/sonar/db/issue}/IssueChangeMapper.xml (97%) rename {sonar-core/src/main/resources/org/sonar/core/issue/db => sonar-db/src/main/resources/org/sonar/db/issue}/IssueFilterFavouriteMapper.xml (80%) rename {sonar-core/src/main/resources/org/sonar/core/issue/db => sonar-db/src/main/resources/org/sonar/db/issue}/IssueFilterMapper.xml (78%) rename {sonar-core/src/main/resources/org/sonar/core/issue/db => sonar-db/src/main/resources/org/sonar/db/issue}/IssueMapper.xml (98%) rename {sonar-core/src/main/resources/org/sonar/core/template => sonar-db/src/main/resources/org/sonar/db/loadedtemplate}/LoadedTemplateMapper.xml (92%) rename {sonar-core/src/main/resources/org/sonar/core/measure/custom/db => sonar-db/src/main/resources/org/sonar/db/measure}/CustomMeasureMapper.xml (97%) rename {sonar-core/src/main/resources/org/sonar/core/measure/db => sonar-db/src/main/resources/org/sonar/db/measure}/MeasureFilterMapper.xml (76%) rename {sonar-core/src/main/resources/org/sonar/core/measure/db => sonar-db/src/main/resources/org/sonar/db/measure}/MeasureMapper.xml (89%) rename {sonar-core/src/main/resources/org/sonar/core/metric/db => sonar-db/src/main/resources/org/sonar/db/metric}/MetricMapper.xml (88%) rename {sonar-core/src/main/resources/org/sonar/core/notification/db => sonar-db/src/main/resources/org/sonar/db/notification}/NotificationQueueMapper.xml (73%) rename {sonar-core/src/main/resources/org/sonar/core => sonar-db/src/main/resources/org/sonar/db}/permission/PermissionMapper.xml (93%) rename {sonar-core/src/main/resources/org/sonar/core => sonar-db/src/main/resources/org/sonar/db}/permission/PermissionTemplateMapper.xml (78%) rename {sonar-core/src/main/resources/org/sonar/core/properties => sonar-db/src/main/resources/org/sonar/db/property}/PropertiesMapper.xml (95%) rename {sonar-core/src/main/resources/org/sonar/core => sonar-db/src/main/resources/org/sonar/db}/purge/PurgeMapper.xml (99%) rename {sonar-core/src/main/resources/org/sonar/core/qualitygate/db => sonar-db/src/main/resources/org/sonar/db/qualitygate}/ProjectQgateAssociationMapper.xml (88%) rename {sonar-core/src/main/resources/org/sonar/core/qualitygate/db => sonar-db/src/main/resources/org/sonar/db/qualitygate}/QualityGateConditionMapper.xml (59%) rename {sonar-core/src/main/resources/org/sonar/core/qualitygate/db => sonar-db/src/main/resources/org/sonar/db/qualitygate}/QualityGateMapper.xml (69%) rename {sonar-core/src/main/resources/org/sonar/core/qualityprofile/db => sonar-db/src/main/resources/org/sonar/db/qualityprofile}/ActiveRuleMapper.xml (97%) rename {sonar-core/src/main/resources/org/sonar/core/qualityprofile/db => sonar-db/src/main/resources/org/sonar/db/qualityprofile}/QualityProfileMapper.xml (80%) rename {sonar-core/src/main/resources/org/sonar/core => sonar-db/src/main/resources/org/sonar/db}/rule/RuleMapper.xml (93%) rename {sonar-core/src/main/resources/org/sonar/core/persistence => sonar-db/src/main/resources/org/sonar/db/semaphore}/SemaphoreMapper.xml (84%) rename {sonar-core/src/main/resources/org/sonar/core/source/db => sonar-db/src/main/resources/org/sonar/db/source}/FileSourceMapper.xml (63%) rename {sonar-core/src/main/resources/org/sonar/core/source/db => sonar-db/src/main/resources/org/sonar/db/source}/SnapshotDataMapper.xml (82%) rename {sonar-core/src/main/resources/org/sonar/core => sonar-db/src/main/resources/org/sonar/db}/user/AuthorMapper.xml (90%) rename {sonar-core/src/main/resources/org/sonar/core => sonar-db/src/main/resources/org/sonar/db}/user/AuthorizationMapper.xml (79%) rename {sonar-core/src/main/resources/org/sonar/core => sonar-db/src/main/resources/org/sonar/db}/user/GroupMapper.xml (83%) rename {sonar-core/src/main/resources/org/sonar/core => sonar-db/src/main/resources/org/sonar/db}/user/GroupMembershipMapper.xml (81%) rename {sonar-core/src/main/resources/org/sonar/core => sonar-db/src/main/resources/org/sonar/db}/user/RoleMapper.xml (95%) rename {sonar-core/src/main/resources/org/sonar/core => sonar-db/src/main/resources/org/sonar/db}/user/UserGroupMapper.xml (79%) rename {sonar-core/src/main/resources/org/sonar/core => sonar-db/src/main/resources/org/sonar/db}/user/UserMapper.xml (89%) rename {sonar-core/src/main/resources/org/sonar/core/persistence => sonar-db/src/main/resources/org/sonar/db/version}/SchemaMigrationMapper.xml (85%) rename {sonar-core/src/main/resources/org/sonar/core/persistence => sonar-db/src/main/resources/org/sonar/db/version}/rows-h2.sql (100%) rename {sonar-core/src/main/resources/org/sonar/core/persistence => sonar-db/src/main/resources/org/sonar/db/version}/schema-h2.ddl (100%) rename {sonar-core/src/main/resources/org/sonar/core/persistence/migration => sonar-db/src/main/resources/org/sonar/db/version}/v44/Migration44Mapper.xml (82%) rename {sonar-core/src/main/resources/org/sonar/core/persistence/migration => sonar-db/src/main/resources/org/sonar/db/version}/v45/Migration45Mapper.xml (66%) rename {sonar-core/src/main/resources/org/sonar/core/persistence/migration => sonar-db/src/main/resources/org/sonar/db/version}/v50/Migration50Mapper.xml (66%) rename {sonar-core => sonar-db}/src/test/java/org/sonar/core/issue/ActionPlanStatsTest.java (99%) rename {sonar-core => sonar-db}/src/test/java/org/sonar/core/timemachine/PeriodsTest.java (97%) rename {sonar-core => sonar-db}/src/test/java/org/sonar/core/user/DefaultUserFinderTest.java (92%) rename {sonar-core => sonar-db}/src/test/java/org/sonar/core/user/DefaultUserTest.java (100%) rename {sonar-core => sonar-db}/src/test/java/org/sonar/core/user/DeprecatedUserFinderTest.java (97%) rename {sonar-core/src/test/java/org/sonar/core/persistence => sonar-db/src/test/java/org/sonar/db}/AbstractDaoTestCase.java (97%) rename {sonar-core/src/test/java/org/sonar/core/persistence => sonar-db/src/test/java/org/sonar/db}/BatchSessionTest.java (76%) rename {sonar-core/src/test/java/org/sonar/core/persistence => sonar-db/src/test/java/org/sonar/db}/DaoUtilsTest.java (98%) rename {sonar-core/src/test/java/org/sonar/core/persistence => sonar-db/src/test/java/org/sonar/db}/DatabaseCommands.java (94%) rename {sonar-core/src/test/java/org/sonar/core/persistence => sonar-db/src/test/java/org/sonar/db}/DatabaseUtilsTest.java (97%) rename {sonar-core/src/test/java/org/sonar/core/persistence => sonar-db/src/test/java/org/sonar/db}/DbTester.java (97%) rename {sonar-core/src/test/java/org/sonar/core/persistence => sonar-db/src/test/java/org/sonar/db}/DdlUtilsTest.java (93%) rename {sonar-core/src/test/java/org/sonar/core/persistence => sonar-db/src/test/java/org/sonar/db}/DefaultDatabaseTest.java (97%) rename {sonar-core/src/test/java/org/sonar/core/persistence => sonar-db/src/test/java/org/sonar/db}/H2Database.java (95%) rename {sonar-core/src/test/java/org/sonar/core/persistence => sonar-db/src/test/java/org/sonar/db}/H2DatabaseTest.java (97%) rename {sonar-core/src/test/java/org/sonar/core/persistence => sonar-db/src/test/java/org/sonar/db}/IsAliveMapperTest.java (97%) rename {sonar-core/src/test/java/org/sonar/core/persistence => sonar-db/src/test/java/org/sonar/db}/MyBatisTest.java (87%) rename {sonar-core/src/test/java/org/sonar/core => sonar-db/src/test/java/org/sonar/db}/component/ComponentDtoTest.java (99%) rename {sonar-core/src/test/java/org/sonar/core => sonar-db/src/test/java/org/sonar/db}/component/ComponentLinkDtoTest.java (98%) rename {sonar-core/src/test/java/org/sonar/core/resource => sonar-db/src/test/java/org/sonar/db/component}/ResourceDaoTest.java (98%) rename {sonar-core/src/test/java/org/sonar/core/resource => sonar-db/src/test/java/org/sonar/db/component}/ResourceIndexerDaoTest.java (98%) rename {sonar-core/src/test/java/org/sonar/core/resource => sonar-db/src/test/java/org/sonar/db/component}/ResourceKeyUpdaterDaoTest.java (97%) rename {sonar-core/src/test/java/org/sonar/core => sonar-db/src/test/java/org/sonar/db}/component/SnapshotDtoTest.java (99%) rename {sonar-core/src/test/java/org/sonar/core/component/db => sonar-db/src/test/java/org/sonar/db/component}/SnapshotQueryTest.java (90%) rename {sonar-core/src/test/java/org/sonar/core => sonar-db/src/test/java/org/sonar/db}/dashboard/ActiveDashboardDaoTest.java (97%) rename {sonar-core/src/test/java/org/sonar/core => sonar-db/src/test/java/org/sonar/db}/dashboard/DashboardDaoTest.java (98%) rename {sonar-core/src/test/java/org/sonar/core/technicaldebt/db => sonar-db/src/test/java/org/sonar/db/debt}/CharacteristicDaoTest.java (98%) rename {sonar-core/src/test/java/org/sonar/core/technicaldebt/db => sonar-db/src/test/java/org/sonar/db/debt}/CharacteristicDtoTest.java (98%) rename {sonar-core/src/test/java/org/sonar/core/persistence => sonar-db/src/test/java/org/sonar/db}/dialect/DialectUtilsTest.java (97%) rename {sonar-core/src/test/java/org/sonar/core/persistence => sonar-db/src/test/java/org/sonar/db}/dialect/H2Test.java (97%) rename {sonar-core/src/test/java/org/sonar/core/persistence => sonar-db/src/test/java/org/sonar/db}/dialect/MsSqlTest.java (97%) rename {sonar-core/src/test/java/org/sonar/core/persistence => sonar-db/src/test/java/org/sonar/db}/dialect/MySqlTest.java (98%) rename {sonar-core/src/test/java/org/sonar/core/persistence => sonar-db/src/test/java/org/sonar/db}/dialect/OracleTest.java (97%) rename {sonar-core/src/test/java/org/sonar/core/persistence => sonar-db/src/test/java/org/sonar/db}/dialect/PostgreSqlTest.java (97%) rename {sonar-core/src/test/java/org/sonar/core => sonar-db/src/test/java/org/sonar/db}/duplication/DuplicationDaoTest.java (95%) rename {sonar-core/src/test/java/org/sonar/core => sonar-db/src/test/java/org/sonar/db}/event/EventDtoTest.java (98%) rename {sonar-core/src/test/java/org/sonar/core/issue/db => sonar-db/src/test/java/org/sonar/db/issue}/ActionPlanDaoTest.java (84%) rename {sonar-core/src/test/java/org/sonar/core/issue/db => sonar-db/src/test/java/org/sonar/db/issue}/ActionPlanStatsDaoTest.java (95%) rename {sonar-core/src/test/java/org/sonar/core/issue/db => sonar-db/src/test/java/org/sonar/db/issue}/IssueChangeDaoTest.java (97%) rename {sonar-core/src/test/java/org/sonar/core/issue/db => sonar-db/src/test/java/org/sonar/db/issue}/IssueChangeDtoTest.java (99%) rename {sonar-core/src/test/java/org/sonar/core/issue/db => sonar-db/src/test/java/org/sonar/db/issue}/IssueChangeMapperTest.java (94%) rename {sonar-core/src/test/java/org/sonar/core/issue/db => sonar-db/src/test/java/org/sonar/db/issue}/IssueDaoTest.java (96%) rename {sonar-core/src/test/java/org/sonar/core/issue/db => sonar-db/src/test/java/org/sonar/db/issue}/IssueDtoTest.java (98%) rename {sonar-core/src/test/java/org/sonar/core/issue/db => sonar-db/src/test/java/org/sonar/db/issue}/IssueFilterDaoTest.java (90%) rename {sonar-core/src/test/java/org/sonar/core/issue/db => sonar-db/src/test/java/org/sonar/db/issue}/IssueFilterFavouriteDaoTest.java (89%) rename {sonar-core/src/test/java/org/sonar/core/issue/db => sonar-db/src/test/java/org/sonar/db/issue}/IssueMapperTest.java (97%) rename {sonar-core/src/test/java/org/sonar/core/template => sonar-db/src/test/java/org/sonar/db/loadedtemplate}/LoadedTemplateDaoTest.java (95%) rename {sonar-core/src/test/java/org/sonar/core/measure/db => sonar-db/src/test/java/org/sonar/db/measure}/MeasureDtoTest.java (97%) rename {sonar-core/src/test/java/org/sonar/core/measure/db => sonar-db/src/test/java/org/sonar/db/measure}/MeasureFilterDaoTest.java (91%) rename {sonar-core/src/test/java/org/sonar/core/measure/db => sonar-db/src/test/java/org/sonar/db/measure}/PastMeasureDtoTest.java (98%) rename {sonar-core/src/test/java/org/sonar/core/metric/db => sonar-db/src/test/java/org/sonar/db/metric}/MetricDtoTest.java (98%) rename {sonar-core/src/test/java/org/sonar/core/notification/db => sonar-db/src/test/java/org/sonar/db/notification}/NotificationQueueDaoTest.java (96%) rename {sonar-core/src/test/java/org/sonar/core => sonar-db/src/test/java/org/sonar/db}/permission/GroupWithPermissionDaoTest.java (98%) rename {sonar-core/src/test/java/org/sonar/core => sonar-db/src/test/java/org/sonar/db}/permission/GroupWithPermissionDtoTest.java (95%) rename {sonar-core/src/test/java/org/sonar/core => sonar-db/src/test/java/org/sonar/db}/permission/GroupWithPermissionTemplateDaoTest.java (98%) rename {sonar-core/src/test/java/org/sonar/core => sonar-db/src/test/java/org/sonar/db}/permission/GroupWithPermissionTest.java (95%) rename {sonar-core/src/test/java/org/sonar/core => sonar-db/src/test/java/org/sonar/db}/permission/PermissionFacadeTest.java (97%) rename {sonar-core/src/test/java/org/sonar/core => sonar-db/src/test/java/org/sonar/db}/permission/PermissionTemplateDaoTest.java (97%) rename {sonar-core/src/test/java/org/sonar/core => sonar-db/src/test/java/org/sonar/db}/permission/UserWithPermissionDaoTest.java (98%) rename {sonar-core/src/test/java/org/sonar/core => sonar-db/src/test/java/org/sonar/db}/permission/UserWithPermissionDtoTest.java (95%) rename {sonar-core/src/test/java/org/sonar/core => sonar-db/src/test/java/org/sonar/db}/permission/UserWithPermissionTemplateDaoTest.java (98%) rename {sonar-core/src/test/java/org/sonar/core => sonar-db/src/test/java/org/sonar/db}/permission/UserWithPermissionTest.java (96%) rename {sonar-core/src/test/java/org/sonar/core/persistence => sonar-db/src/test/java/org/sonar/db}/profiling/InvocationUtilsTest.java (95%) rename {sonar-core/src/test/java/org/sonar/core/persistence => sonar-db/src/test/java/org/sonar/db}/profiling/ProfiledDataSourceTest.java (97%) rename {sonar-core/src/test/java/org/sonar/core/properties => sonar-db/src/test/java/org/sonar/db/property}/PropertiesDaoTest.java (98%) rename {sonar-core/src/test/java/org/sonar/core/properties => sonar-db/src/test/java/org/sonar/db/property}/PropertyDtoTest.java (95%) rename {sonar-core/src/test/java/org/sonar/core/computation/dbcleaner => sonar-db/src/test/java/org/sonar/db/purge}/DbCleanerTestUtils.java (94%) rename {sonar-core/src/test/java/org/sonar/core => sonar-db/src/test/java/org/sonar/db}/purge/IdUuidPairsTest.java (98%) rename {sonar-core/src/test/java/org/sonar/core => sonar-db/src/test/java/org/sonar/db}/purge/PurgeCommandsTest.java (97%) rename {sonar-core/src/test/java/org/sonar/core => sonar-db/src/test/java/org/sonar/db}/purge/PurgeConfigurationTest.java (89%) rename {sonar-core/src/test/java/org/sonar/core => sonar-db/src/test/java/org/sonar/db}/purge/PurgeDaoTest.java (93%) rename {sonar-core/src/test/java/org/sonar/core => sonar-db/src/test/java/org/sonar/db}/purge/PurgeProfilerTest.java (95%) rename {sonar-core/src/test/java/org/sonar/core => sonar-db/src/test/java/org/sonar/db}/purge/PurgeableSnapshotDtoTest.java (98%) rename {sonar-core/src/test/java/org/sonar/core/computation/dbcleaner => sonar-db/src/test/java/org/sonar/db/purge}/period/DefaultPeriodCleanerTest.java (93%) rename {sonar-core/src/test/java/org/sonar/core/computation/dbcleaner => sonar-db/src/test/java/org/sonar/db/purge}/period/DeleteAllFilterTest.java (90%) rename {sonar-core/src/test/java/org/sonar/core/computation/dbcleaner => sonar-db/src/test/java/org/sonar/db/purge}/period/IntervalTest.java (96%) rename {sonar-core/src/test/java/org/sonar/core/computation/dbcleaner => sonar-db/src/test/java/org/sonar/db/purge}/period/KeepOneFilterTest.java (95%) rename {sonar-core/src/test/java/org/sonar/core/qualitygate/db => sonar-db/src/test/java/org/sonar/db/qualitygate}/ProjectQgateAssociationDaoTest.java (97%) rename {sonar-core/src/test/java/org/sonar/core/qualitygate/db => sonar-db/src/test/java/org/sonar/db/qualitygate}/ProjectQgateAssociationDtoTest.java (97%) rename {sonar-core/src/test/java/org/sonar/core/qualitygate/db => sonar-db/src/test/java/org/sonar/db/qualitygate}/ProjectQgateAssociationQueryTest.java (97%) rename {sonar-core/src/test/java/org/sonar/core/qualitygate/db => sonar-db/src/test/java/org/sonar/db/qualitygate}/QualityGateConditionDaoTest.java (97%) rename {sonar-core/src/test/java/org/sonar/core/qualitygate/db => sonar-db/src/test/java/org/sonar/db/qualitygate}/QualityGateConditionDtoTest.java (72%) rename {sonar-core/src/test/java/org/sonar/core/qualitygate/db => sonar-db/src/test/java/org/sonar/db/qualitygate}/QualityGateDaoTest.java (96%) rename {sonar-core/src/test/java/org/sonar/core/qualityprofile/db => sonar-db/src/test/java/org/sonar/db/qualityprofile}/ActiveRuleDaoTest.java (93%) rename {sonar-core/src/test/java/org/sonar/core/qualityprofile/db => sonar-db/src/test/java/org/sonar/db/qualityprofile}/ActiveRuleKeyTest.java (98%) rename {sonar-core/src/test/java/org/sonar/core/qualityprofile/db => sonar-db/src/test/java/org/sonar/db/qualityprofile}/ActiveRuleParamDtoTest.java (96%) rename {sonar-core/src/test/java/org/sonar/core/qualityprofile/db => sonar-db/src/test/java/org/sonar/db/qualityprofile}/QualityProfileDaoTest.java (94%) rename {sonar-core/src/test/java/org/sonar/core => sonar-db/src/test/java/org/sonar/db}/rule/RuleDaoTest.java (97%) rename {sonar-core/src/test/java/org/sonar/core/persistence => sonar-db/src/test/java/org/sonar/db/semaphore}/SemaphoreDaoTest.java (98%) rename {sonar-core/src/test/java/org/sonar/core/persistence => sonar-db/src/test/java/org/sonar/db/semaphore}/SemaphoreUpdaterTest.java (96%) rename {sonar-core/src/test/java/org/sonar/core/persistence => sonar-db/src/test/java/org/sonar/db/semaphore}/SemaphoresImplTest.java (98%) rename {sonar-core/src/test/java/org/sonar/core/source/db => sonar-db/src/test/java/org/sonar/db/source}/FileSourceDtoTest.java (97%) rename {sonar-core/src/test/java/org/sonar/core => sonar-db/src/test/java/org/sonar/db}/user/AuthorDaoTest.java (96%) rename {sonar-core/src/test/java/org/sonar/core => sonar-db/src/test/java/org/sonar/db}/user/AuthorizationDaoTest.java (98%) rename {sonar-core/src/test/java/org/sonar/core => sonar-db/src/test/java/org/sonar/db}/user/GroupDtoTest.java (97%) rename {sonar-core/src/test/java/org/sonar/core => sonar-db/src/test/java/org/sonar/db}/user/GroupMembershipDaoTest.java (97%) rename {sonar-core/src/test/java/org/sonar/core => sonar-db/src/test/java/org/sonar/db}/user/GroupMembershipDtoTest.java (96%) rename {sonar-core/src/test/java/org/sonar/core => sonar-db/src/test/java/org/sonar/db}/user/GroupMembershipQueryTest.java (98%) rename {sonar-core/src/test/java/org/sonar/core => sonar-db/src/test/java/org/sonar/db}/user/GroupMembershipTest.java (96%) rename {sonar-core/src/test/java/org/sonar/core => sonar-db/src/test/java/org/sonar/db}/user/RoleDaoTest.java (97%) rename {sonar-core/src/test/java/org/sonar/core => sonar-db/src/test/java/org/sonar/db}/user/RoleMapperTest.java (95%) rename {sonar-core/src/test/java/org/sonar/core => sonar-db/src/test/java/org/sonar/db}/user/UserDaoTest.java (98%) rename {sonar-core/src/test/java/org/sonar/core => sonar-db/src/test/java/org/sonar/db}/user/UserDtoTest.java (98%) rename {sonar-core/src/test/java/org/sonar/core/persistence => sonar-db/src/test/java/org/sonar/db/version}/DatabaseVersionTest.java (96%) rename {sonar-core/src/test/java/org/sonar/core/persistence/migration => sonar-db/src/test/java/org/sonar/db/version}/v44/ChangeLogTest.java (96%) rename {sonar-core/src/test/java/org/sonar/core/persistence/migration => sonar-db/src/test/java/org/sonar/db/version}/v44/ProfileMeasureTest.java (96%) rename {sonar-core/src/test/java/org/sonar/core/persistence/migration => sonar-db/src/test/java/org/sonar/db/version}/v50/ComponentTest.java (96%) rename {sonar-core => sonar-db}/src/test/java/org/sonar/jpa/test/AbstractDbUnitTestCase.java (94%) rename {sonar-core => sonar-db}/src/test/resources/logback-test.xml (72%) rename {sonar-core => sonar-db}/src/test/resources/org/sonar/api/database/configuration/DatabaseConfigurationTest/some-properties.xml (100%) create mode 100644 sonar-db/src/test/resources/org/sonar/core/qualitymodel/DefaultModelFinderTest/shared.xml rename {sonar-core => sonar-db}/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/fail_when_no_default_template_is_defined.xml (100%) rename {sonar-core => sonar-db}/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRoles-result.xml (100%) rename {sonar-core => sonar-db}/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRoles.xml (90%) rename {sonar-core => sonar-db}/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRolesPattern-result.xml (92%) rename {sonar-core => sonar-db}/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRolesPattern.xml (84%) rename {sonar-core => sonar-db}/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRolesProject-result.xml (95%) rename {sonar-core => sonar-db}/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRolesProject.xml (94%) rename {sonar-core => sonar-db}/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRolesSeveralPattern.xml (84%) rename {sonar-core => sonar-db}/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRoles_unknown_group-result.xml (100%) rename {sonar-core => sonar-db}/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRoles_unknown_group.xml (86%) rename {sonar-core => sonar-db}/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRoles_users-result.xml (100%) rename {sonar-core => sonar-db}/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRoles_users.xml (85%) rename {sonar-core => sonar-db}/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantGroupRole-result.xml (100%) create mode 100644 sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantGroupRole.xml create mode 100644 sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantGroupRole_anyone-result.xml create mode 100644 sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantGroupRole_anyone.xml rename {sonar-core => sonar-db}/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantGroupRole_ignore_if_group_not_found-result.xml (52%) rename {sonar-core => sonar-db}/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantGroupRole_ignore_if_group_not_found.xml (52%) rename {sonar-core => sonar-db}/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantGroupRole_ignore_if_not_persisted-result.xml (52%) rename {sonar-core => sonar-db}/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantGroupRole_ignore_if_not_persisted.xml (52%) rename {sonar-core => sonar-db}/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantUserRole-result.xml (100%) rename {sonar-core => sonar-db}/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantUserRole.xml (73%) rename {sonar-core => sonar-db}/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/hasRoles.xml (100%) rename {sonar-core => sonar-db}/src/test/resources/org/sonar/core/user/DeprecatedUserFinderTest/fixture.xml (65%) rename {sonar-core/src/test/resources/org/sonar/core/resource => sonar-db/src/test/resources/org/sonar/db/component}/ResourceDaoTest/fixture-including-ghost-projects-and-technical-project.xml (65%) create mode 100644 sonar-db/src/test/resources/org/sonar/db/component/ResourceDaoTest/fixture.xml rename {sonar-core/src/test/resources/org/sonar/core/resource => sonar-db/src/test/resources/org/sonar/db/component}/ResourceDaoTest/getResources_exclude_disabled.xml (82%) create mode 100644 sonar-db/src/test/resources/org/sonar/db/component/ResourceDaoTest/get_last_snapshot_by_component_uuid.xml rename {sonar-core/src/test/resources/org/sonar/core/resource => sonar-db/src/test/resources/org/sonar/db/component}/ResourceDaoTest/insert-result.xml (76%) rename {sonar-core/src/test/resources/org/sonar/core/qualitygate/db/QualityGateConditionDaoTest => sonar-db/src/test/resources/org/sonar/db/component/ResourceDaoTest}/insert.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core/resource => sonar-db/src/test/resources/org/sonar/db/component}/ResourceDaoTest/update-result.xml (78%) rename {sonar-core/src/test/resources/org/sonar/core/resource => sonar-db/src/test/resources/org/sonar/db/component}/ResourceDaoTest/update.xml (78%) rename {sonar-core/src/test/resources/org/sonar/core/resource => sonar-db/src/test/resources/org/sonar/db/component}/ResourceDaoTest/update_authorization_date-result.xml (78%) rename {sonar-core/src/test/resources/org/sonar/core/resource => sonar-db/src/test/resources/org/sonar/db/component}/ResourceDaoTest/update_authorization_date.xml (78%) rename {sonar-core/src/test/resources/org/sonar/core/resource => sonar-db/src/test/resources/org/sonar/db/component}/ResourceIndexerDaoTest/shouldIndexMultiModulesProject-result.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core/resource => sonar-db/src/test/resources/org/sonar/db/component}/ResourceIndexerDaoTest/shouldIndexMultiModulesProject.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core/resource => sonar-db/src/test/resources/org/sonar/db/component}/ResourceIndexerDaoTest/shouldIndexProjects-result.xml (93%) rename {sonar-core/src/test/resources/org/sonar/core/resource => sonar-db/src/test/resources/org/sonar/db/component}/ResourceIndexerDaoTest/shouldIndexProjects.xml (81%) rename {sonar-core/src/test/resources/org/sonar/core/resource => sonar-db/src/test/resources/org/sonar/db/component}/ResourceIndexerDaoTest/shouldIndexResource-result.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core/resource => sonar-db/src/test/resources/org/sonar/db/component}/ResourceIndexerDaoTest/shouldIndexResource.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core/resource => sonar-db/src/test/resources/org/sonar/db/component}/ResourceIndexerDaoTest/shouldIndexTwoLettersLongResource-result.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core/resource => sonar-db/src/test/resources/org/sonar/db/component}/ResourceIndexerDaoTest/shouldIndexTwoLettersLongResource.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core/resource => sonar-db/src/test/resources/org/sonar/db/component}/ResourceIndexerDaoTest/shouldNotIndexPackages.xml (81%) rename {sonar-core/src/test/resources/org/sonar/core/resource => sonar-db/src/test/resources/org/sonar/db/component}/ResourceIndexerDaoTest/shouldNotReindexUnchangedResource-result.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core/resource => sonar-db/src/test/resources/org/sonar/db/component}/ResourceIndexerDaoTest/shouldNotReindexUnchangedResource.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core/resource => sonar-db/src/test/resources/org/sonar/db/component}/ResourceIndexerDaoTest/shouldReIndexNewTwoLettersLongResource-result.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core/resource => sonar-db/src/test/resources/org/sonar/db/component}/ResourceIndexerDaoTest/shouldReIndexNewTwoLettersLongResource.xml (93%) rename {sonar-core/src/test/resources/org/sonar/core/resource => sonar-db/src/test/resources/org/sonar/db/component}/ResourceIndexerDaoTest/shouldReIndexTwoLettersLongResource-result.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core/resource => sonar-db/src/test/resources/org/sonar/db/component}/ResourceIndexerDaoTest/shouldReIndexTwoLettersLongResource.xml (89%) rename {sonar-core/src/test/resources/org/sonar/core/resource => sonar-db/src/test/resources/org/sonar/db/component}/ResourceIndexerDaoTest/shouldReindexProjectAfterRenaming-result.xml (95%) rename {sonar-core/src/test/resources/org/sonar/core/resource => sonar-db/src/test/resources/org/sonar/db/component}/ResourceIndexerDaoTest/shouldReindexProjectAfterRenaming.xml (93%) rename {sonar-core/src/test/resources/org/sonar/core/resource => sonar-db/src/test/resources/org/sonar/db/component}/ResourceIndexerDaoTest/shouldReindexResource-result.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core/resource => sonar-db/src/test/resources/org/sonar/db/component}/ResourceIndexerDaoTest/shouldReindexResource.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core/resource => sonar-db/src/test/resources/org/sonar/db/component}/ResourceKeyUpdaterDaoTest/shared.xml (55%) rename {sonar-core/src/test/resources/org/sonar/core/resource => sonar-db/src/test/resources/org/sonar/db/component}/ResourceKeyUpdaterDaoTest/shouldBulkUpdateKey-result.xml (53%) rename {sonar-core/src/test/resources/org/sonar/core/resource => sonar-db/src/test/resources/org/sonar/db/component}/ResourceKeyUpdaterDaoTest/shouldBulkUpdateKeyOnOnlyOneSubmodule-result.xml (55%) rename {sonar-core/src/test/resources/org/sonar/core/resource => sonar-db/src/test/resources/org/sonar/db/component}/ResourceKeyUpdaterDaoTest/shouldNotUpdateAllSubmodules-result.xml (53%) rename {sonar-core/src/test/resources/org/sonar/core/resource => sonar-db/src/test/resources/org/sonar/db/component}/ResourceKeyUpdaterDaoTest/shouldNotUpdateAllSubmodules.xml (56%) rename {sonar-core/src/test/resources/org/sonar/core/resource => sonar-db/src/test/resources/org/sonar/db/component}/ResourceKeyUpdaterDaoTest/shouldUpdateKey-result.xml (57%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/dashboard/ActiveDashboardDaoTest/empty.xml (100%) create mode 100644 sonar-db/src/test/resources/org/sonar/db/dashboard/ActiveDashboardDaoTest/shouldGetMaxOrderIndexForNullUser.xml create mode 100644 sonar-db/src/test/resources/org/sonar/db/dashboard/ActiveDashboardDaoTest/shouldInsert-result.xml rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/dashboard/ActiveDashboardDaoTest/shouldInsert.xml (100%) create mode 100644 sonar-db/src/test/resources/org/sonar/db/dashboard/ActiveDashboardDaoTest/shouldInsertWithNoUser-result.xml rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/dashboard/ActiveDashboardDaoTest/shouldSelectDashboardsForAnonymous.xml (92%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/dashboard/ActiveDashboardDaoTest/shouldSelectDashboardsForUser.xml (90%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/dashboard/ActiveDashboardDaoTest/shouldSelectProjectDashboardsForAnonymous.xml (92%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/dashboard/ActiveDashboardDaoTest/shouldSelectProjectDashboardsForUser.xml (90%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/dashboard/DashboardDaoTest/shouldInsert-result.xml (96%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/dashboard/DashboardDaoTest/shouldInsert.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/dashboard/DashboardDaoTest/shouldInsertWithNullableColumns-result.xml (96%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/dashboard/DashboardDaoTest/shouldSelectGlobalDashboard.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core/technicaldebt/db => sonar-db/src/test/resources/org/sonar/db/debt}/CharacteristicDaoTest/insert_characteristic-result.xml (57%) rename {sonar-core/src/test/resources/org/sonar/core/technicaldebt/db => sonar-db/src/test/resources/org/sonar/db/debt}/CharacteristicDaoTest/select_enabled_root_characteristics.xml (75%) rename {sonar-core/src/test/resources/org/sonar/core/technicaldebt/db => sonar-db/src/test/resources/org/sonar/db/debt}/CharacteristicDaoTest/select_enabled_root_characteristics_order_by_characteristic_order.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core/technicaldebt/db => sonar-db/src/test/resources/org/sonar/db/debt}/CharacteristicDaoTest/select_max_characteristic_order_when_characteristics_are_all_disabled.xml (83%) rename {sonar-core/src/test/resources/org/sonar/core/technicaldebt/db => sonar-db/src/test/resources/org/sonar/db/debt}/CharacteristicDaoTest/select_sub_characteristics_by_parent_id.xml (77%) rename {sonar-core/src/test/resources/org/sonar/core/technicaldebt/db => sonar-db/src/test/resources/org/sonar/db/debt}/CharacteristicDaoTest/shared.xml (75%) rename {sonar-core/src/test/resources/org/sonar/core/technicaldebt/db => sonar-db/src/test/resources/org/sonar/db/debt}/CharacteristicDaoTest/update_characteristic-result.xml (62%) rename {sonar-core/src/test/resources/org/sonar/core/technicaldebt/db => sonar-db/src/test/resources/org/sonar/db/debt}/CharacteristicDaoTest/update_characteristic.xml (57%) rename {sonar-core/src/test/resources/org/sonar/core/technicaldebt/db => sonar-db/src/test/resources/org/sonar/db/debt}/RequirementDaoTest/select_requirement.xml (58%) rename {sonar-core/src/test/resources/org/sonar/core/technicaldebt/db => sonar-db/src/test/resources/org/sonar/db/debt}/RequirementDaoTest/shared.xml (57%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/duplication/DuplicationDaoTest/shouldGetByHash.xml (68%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/duplication/DuplicationDaoTest/shouldInsert-result.xml (67%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/duplication/DuplicationDaoTest/shouldInsert.xml (80%) create mode 100644 sonar-db/src/test/resources/org/sonar/db/issue/ActionPlanDaoTest/shared.xml rename {sonar-core/src/test/resources/org/sonar/core/issue/db => sonar-db/src/test/resources/org/sonar/db/issue}/ActionPlanDaoTest/should_delete_action_plan-result.xml (87%) rename {sonar-core/src/test/resources/org/sonar/core/issue/db => sonar-db/src/test/resources/org/sonar/db/issue}/ActionPlanDaoTest/should_delete_action_plan.xml (86%) rename {sonar-core/src/test/resources/org/sonar/core/issue/db => sonar-db/src/test/resources/org/sonar/db/issue}/ActionPlanDaoTest/should_find_by_key.xml (86%) rename {sonar-core/src/test/resources/org/sonar/core/issue/db => sonar-db/src/test/resources/org/sonar/db/issue}/ActionPlanDaoTest/should_find_by_keys.xml (85%) rename {sonar-core/src/test/resources/org/sonar/core/issue/db => sonar-db/src/test/resources/org/sonar/db/issue}/ActionPlanDaoTest/should_find_by_name_and_project_id.xml (86%) rename {sonar-core/src/test/resources/org/sonar/core/issue/db => sonar-db/src/test/resources/org/sonar/db/issue}/ActionPlanDaoTest/should_find_open_by_project_id.xml (86%) rename {sonar-core/src/test/resources/org/sonar/core/issue/db => sonar-db/src/test/resources/org/sonar/db/issue}/ActionPlanDaoTest/should_insert_new_action_plan-result.xml (87%) rename {sonar-core/src/test/resources/org/sonar/core/issue/db => sonar-db/src/test/resources/org/sonar/db/issue}/ActionPlanDaoTest/should_update_action_plan-result.xml (87%) rename {sonar-core/src/test/resources/org/sonar/core/issue/db => sonar-db/src/test/resources/org/sonar/db/issue}/ActionPlanDaoTest/should_update_action_plan.xml (86%) create mode 100644 sonar-db/src/test/resources/org/sonar/db/issue/ActionPlanStatsDaoTest/shared.xml create mode 100644 sonar-db/src/test/resources/org/sonar/db/issue/ActionPlanStatsDaoTest/should_find_by_project.xml rename {sonar-core/src/test/resources/org/sonar/core/issue/db => sonar-db/src/test/resources/org/sonar/db/issue}/IssueChangeDaoTest/delete-result.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core/issue/db => sonar-db/src/test/resources/org/sonar/db/issue}/IssueChangeDaoTest/delete.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core/issue/db => sonar-db/src/test/resources/org/sonar/db/issue}/IssueChangeDaoTest/empty.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core/issue/db => sonar-db/src/test/resources/org/sonar/db/issue}/IssueChangeDaoTest/insert-result.xml (100%) create mode 100644 sonar-db/src/test/resources/org/sonar/db/issue/IssueChangeDaoTest/selectChangelogOfNonClosedIssuesByComponent.xml create mode 100644 sonar-db/src/test/resources/org/sonar/db/issue/IssueChangeDaoTest/shared.xml create mode 100644 sonar-db/src/test/resources/org/sonar/db/issue/IssueChangeDaoTest/update-result.xml rename {sonar-core/src/test/resources/org/sonar/core/issue/db => sonar-db/src/test/resources/org/sonar/db/issue}/IssueChangeDaoTest/update.xml (100%) create mode 100644 sonar-db/src/test/resources/org/sonar/db/issue/IssueChangeMapperTest/insert_comment-result.xml create mode 100644 sonar-db/src/test/resources/org/sonar/db/issue/IssueChangeMapperTest/insert_diff-result.xml create mode 100644 sonar-db/src/test/resources/org/sonar/db/issue/IssueDaoTest/find_severities_by_component.xml create mode 100644 sonar-db/src/test/resources/org/sonar/db/issue/IssueDaoTest/shared.xml create mode 100644 sonar-db/src/test/resources/org/sonar/db/issue/IssueDaoTest/should_select_issue_and_component_ids.xml create mode 100644 sonar-db/src/test/resources/org/sonar/db/issue/IssueDaoTest/should_select_non_closed_issues_by_module.xml create mode 100644 sonar-db/src/test/resources/org/sonar/db/issue/IssueDaoTest/should_select_non_closed_issues_by_module_on_removed_project.xml create mode 100644 sonar-db/src/test/resources/org/sonar/db/issue/IssueFilterDaoTest/shared.xml create mode 100644 sonar-db/src/test/resources/org/sonar/db/issue/IssueFilterDaoTest/should_delete-result.xml create mode 100644 sonar-db/src/test/resources/org/sonar/db/issue/IssueFilterDaoTest/should_insert-result.xml create mode 100644 sonar-db/src/test/resources/org/sonar/db/issue/IssueFilterDaoTest/should_select_by_user.xml create mode 100644 sonar-db/src/test/resources/org/sonar/db/issue/IssueFilterDaoTest/should_select_by_user_with_only_favorite_filters.xml create mode 100644 sonar-db/src/test/resources/org/sonar/db/issue/IssueFilterDaoTest/should_select_provided_by_name.xml create mode 100644 sonar-db/src/test/resources/org/sonar/db/issue/IssueFilterDaoTest/should_update-result.xml create mode 100644 sonar-db/src/test/resources/org/sonar/db/issue/IssueFilterFavouriteDaoTest/shared.xml create mode 100644 sonar-db/src/test/resources/org/sonar/db/issue/IssueFilterFavouriteDaoTest/should_delete-result.xml create mode 100644 sonar-db/src/test/resources/org/sonar/db/issue/IssueFilterFavouriteDaoTest/should_delete_by_issue_filter_id-result.xml create mode 100644 sonar-db/src/test/resources/org/sonar/db/issue/IssueFilterFavouriteDaoTest/should_insert-result.xml create mode 100644 sonar-db/src/test/resources/org/sonar/db/issue/IssueMapperTest/testInsert-result.xml create mode 100644 sonar-db/src/test/resources/org/sonar/db/issue/IssueMapperTest/testUpdate-result.xml create mode 100644 sonar-db/src/test/resources/org/sonar/db/issue/IssueMapperTest/testUpdate.xml create mode 100644 sonar-db/src/test/resources/org/sonar/db/issue/IssueMapperTest/updateBeforeSelectedDate_with_conflict-result.xml create mode 100644 sonar-db/src/test/resources/org/sonar/db/issue/IssueMapperTest/updateBeforeSelectedDate_with_conflict.xml create mode 100644 sonar-db/src/test/resources/org/sonar/db/issue/IssueStatsDaoTest/should_select_assignees.xml rename {sonar-core/src/test/resources/org/sonar/core/template => sonar-db/src/test/resources/org/sonar/db/loadedtemplate}/LoadedTemplateDaoTest/shouldCountByTypeAndKey.xml (100%) create mode 100644 sonar-db/src/test/resources/org/sonar/db/loadedtemplate/LoadedTemplateDaoTest/shouldInsert-result.xml rename {sonar-core/src/test/resources/org/sonar/core/template => sonar-db/src/test/resources/org/sonar/db/loadedtemplate}/LoadedTemplateDaoTest/shouldInsert.xml (100%) rename {sonar-core/src/main/resources/org/sonar/core/measure/db => sonar-db/src/test/resources/org/sonar/db/measure}/MeasureFilterDaoTest/shared.xml (85%) rename {sonar-core/src/main/resources/org/sonar/core/measure/db => sonar-db/src/test/resources/org/sonar/db/measure}/MeasureFilterDaoTest/shouldInsert-result.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core/notification/db => sonar-db/src/test/resources/org/sonar/db/notification}/NotificationQueueDaoTest/should_delete_notification-result.xml (84%) rename {sonar-core/src/test/resources/org/sonar/core/notification/db => sonar-db/src/test/resources/org/sonar/db/notification}/NotificationQueueDaoTest/should_delete_notification.xml (84%) rename {sonar-core/src/test/resources/org/sonar/core/notification/db => sonar-db/src/test/resources/org/sonar/db/notification}/NotificationQueueDaoTest/should_findOldest.xml (84%) rename {sonar-core/src/test/resources/org/sonar/core/notification/db => sonar-db/src/test/resources/org/sonar/db/notification}/NotificationQueueDaoTest/should_insert_new_notification_queue-result.xml (85%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/permission/GroupWithPermissionDaoTest/groups_with_permissions.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/permission/GroupWithPermissionDaoTest/groups_with_permissions_should_be_sorted_by_group_name.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/permission/GroupWithPermissionTemplateDaoTest/groups_with_permissions.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/permission/GroupWithPermissionTemplateDaoTest/groups_with_permissions_should_be_sorted_by_group_name.xml (87%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/permission/PermissionFacadeTest/should_add_user_permission-result.xml (84%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/permission/PermissionFacadeTest/should_add_user_permission.xml (82%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/permission/PermissionFacadeTest/should_apply_permission_template-result.xml (94%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/permission/PermissionFacadeTest/should_apply_permission_template.xml (87%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/permission/PermissionFacadeTest/should_count_component_permissions.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/permission/PermissionFacadeTest/should_delete_group_permission-result.xml (80%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/permission/PermissionFacadeTest/should_delete_group_permission.xml (82%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/permission/PermissionFacadeTest/should_delete_user_permission-result.xml (82%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/permission/PermissionFacadeTest/should_delete_user_permission.xml (84%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/permission/PermissionFacadeTest/should_insert_anyone_group_permission-result.xml (82%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/permission/PermissionFacadeTest/should_insert_anyone_group_permission.xml (80%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/permission/PermissionFacadeTest/should_insert_group_permission-result.xml (82%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/permission/PermissionFacadeTest/should_insert_group_permission.xml (80%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/permission/PermissionFacadeTest/should_remove_all_permissions-result.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/permission/PermissionFacadeTest/should_remove_all_permissions.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/permission/PermissionTemplateDaoTest/addGroupPermissionToTemplate-result.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/permission/PermissionTemplateDaoTest/addGroupPermissionToTemplate.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/permission/PermissionTemplateDaoTest/addNullGroupPermissionToTemplate-result.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/permission/PermissionTemplateDaoTest/addNullGroupPermissionToTemplate.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/permission/PermissionTemplateDaoTest/addUserPermissionToTemplate-result.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/permission/PermissionTemplateDaoTest/addUserPermissionToTemplate.xml (100%) create mode 100644 sonar-db/src/test/resources/org/sonar/db/permission/PermissionTemplateDaoTest/createNonAsciiPermissionTemplate-result.xml rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/permission/PermissionTemplateDaoTest/createNonAsciiPermissionTemplate.xml (100%) create mode 100644 sonar-db/src/test/resources/org/sonar/db/permission/PermissionTemplateDaoTest/createPermissionTemplate-result.xml rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/permission/PermissionTemplateDaoTest/createPermissionTemplate.xml (100%) create mode 100644 sonar-db/src/test/resources/org/sonar/db/permission/PermissionTemplateDaoTest/deletePermissionTemplate-result.xml rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/permission/PermissionTemplateDaoTest/deletePermissionTemplate.xml (75%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/permission/PermissionTemplateDaoTest/removeGroupPermissionFromTemplate-result.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/permission/PermissionTemplateDaoTest/removeGroupPermissionFromTemplate.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/permission/PermissionTemplateDaoTest/removeNullGroupPermissionFromTemplate-result.xml (77%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/permission/PermissionTemplateDaoTest/removeNullGroupPermissionFromTemplate.xml (82%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/permission/PermissionTemplateDaoTest/removeUserPermissionFromTemplate-result.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/permission/PermissionTemplateDaoTest/removeUserPermissionFromTemplate.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/permission/PermissionTemplateDaoTest/remove_by_group-result.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/permission/PermissionTemplateDaoTest/remove_by_group.xml (100%) create mode 100644 sonar-db/src/test/resources/org/sonar/db/permission/PermissionTemplateDaoTest/selectAllPermissionTemplates.xml create mode 100644 sonar-db/src/test/resources/org/sonar/db/permission/PermissionTemplateDaoTest/selectEmptyPermissionTemplate.xml rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/permission/PermissionTemplateDaoTest/selectPermissionTemplate.xml (80%) create mode 100644 sonar-db/src/test/resources/org/sonar/db/permission/PermissionTemplateDaoTest/updatePermissionTemplate-result.xml create mode 100644 sonar-db/src/test/resources/org/sonar/db/permission/PermissionTemplateDaoTest/updatePermissionTemplate.xml rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/permission/UserWithPermissionDaoTest/select_only_enable_users.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/permission/UserWithPermissionDaoTest/users_with_permissions.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/permission/UserWithPermissionDaoTest/users_with_permissions_should_be_sorted_by_user_name.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/permission/UserWithPermissionTemplateDaoTest/select_only_enable_users.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/permission/UserWithPermissionTemplateDaoTest/users_with_permissions.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/permission/UserWithPermissionTemplateDaoTest/users_with_permissions_should_be_sorted_by_user_name.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core/properties => sonar-db/src/test/resources/org/sonar/db/property}/PropertiesDaoTest/deleteAllProperties-result.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core/properties => sonar-db/src/test/resources/org/sonar/db/property}/PropertiesDaoTest/deleteAllProperties.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core/properties => sonar-db/src/test/resources/org/sonar/db/property}/PropertiesDaoTest/deleteGlobalProperties-result.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core/properties => sonar-db/src/test/resources/org/sonar/db/property}/PropertiesDaoTest/deleteGlobalProperties.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core/properties => sonar-db/src/test/resources/org/sonar/db/property}/PropertiesDaoTest/deleteGlobalProperty-result.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core/properties => sonar-db/src/test/resources/org/sonar/db/property}/PropertiesDaoTest/deleteGlobalProperty.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core/properties => sonar-db/src/test/resources/org/sonar/db/property}/PropertiesDaoTest/delete_project_properties-result.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core/properties => sonar-db/src/test/resources/org/sonar/db/property}/PropertiesDaoTest/delete_project_properties.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core/properties => sonar-db/src/test/resources/org/sonar/db/property}/PropertiesDaoTest/delete_project_property-result.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core/properties => sonar-db/src/test/resources/org/sonar/db/property}/PropertiesDaoTest/delete_project_property.xml (100%) create mode 100644 sonar-db/src/test/resources/org/sonar/db/property/PropertiesDaoTest/findNotificationSubscribers.xml rename {sonar-core/src/test/resources/org/sonar/core/properties => sonar-db/src/test/resources/org/sonar/db/property}/PropertiesDaoTest/insert-result.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core/properties => sonar-db/src/test/resources/org/sonar/db/property}/PropertiesDaoTest/insert.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core/properties => sonar-db/src/test/resources/org/sonar/db/property}/PropertiesDaoTest/insertGlobalProperties-result.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core/properties => sonar-db/src/test/resources/org/sonar/db/property}/PropertiesDaoTest/insertGlobalProperties.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core/properties => sonar-db/src/test/resources/org/sonar/db/property}/PropertiesDaoTest/renamePropertyKey-result.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core/properties => sonar-db/src/test/resources/org/sonar/db/property}/PropertiesDaoTest/renamePropertyKey.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core/properties => sonar-db/src/test/resources/org/sonar/db/property}/PropertiesDaoTest/selectGlobalProperties.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core/properties => sonar-db/src/test/resources/org/sonar/db/property}/PropertiesDaoTest/selectProjectProperties.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core/properties => sonar-db/src/test/resources/org/sonar/db/property}/PropertiesDaoTest/selectProjectPropertiesByResourceId.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core/properties => sonar-db/src/test/resources/org/sonar/db/property}/PropertiesDaoTest/select_by_query.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core/properties => sonar-db/src/test/resources/org/sonar/db/property}/PropertiesDaoTest/select_module_properties_tree.xml (81%) rename {sonar-core/src/test/resources/org/sonar/core/properties => sonar-db/src/test/resources/org/sonar/db/property}/PropertiesDaoTest/shouldFindUsersForNotification.xml (98%) rename {sonar-core/src/test/resources/org/sonar/core/properties => sonar-db/src/test/resources/org/sonar/db/property}/PropertiesDaoTest/should_not_rename_if_same_key-result.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core/properties => sonar-db/src/test/resources/org/sonar/db/property}/PropertiesDaoTest/should_not_rename_if_same_key.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core/properties => sonar-db/src/test/resources/org/sonar/db/property}/PropertiesDaoTest/update-result.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core/properties => sonar-db/src/test/resources/org/sonar/db/property}/PropertiesDaoTest/update.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core/properties => sonar-db/src/test/resources/org/sonar/db/property}/PropertiesDaoTest/updateGlobalProperties-result.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core/properties => sonar-db/src/test/resources/org/sonar/db/property}/PropertiesDaoTest/updateGlobalProperties.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core/properties => sonar-db/src/test/resources/org/sonar/db/property}/PropertiesDaoTest/updatePropertiesFromKeyAndValueToNewValue-result.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core/properties => sonar-db/src/test/resources/org/sonar/db/property}/PropertiesDaoTest/updatePropertiesFromKeyAndValueToNewValue.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/purge/PurgeCommandsTest/shouldDeleteResource.xml (99%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/purge/PurgeCommandsTest/shouldDeleteSnapshot-result.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/purge/PurgeCommandsTest/shouldDeleteSnapshot.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/purge/PurgeCommandsTest/shouldDeleteWastedMeasuresWhenPurgingSnapshot-result.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/purge/PurgeCommandsTest/shouldDeleteWastedMeasuresWhenPurgingSnapshot.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/purge/PurgeCommandsTest/shouldPurgeSnapshot-result.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/purge/PurgeCommandsTest/shouldPurgeSnapshot.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/purge/PurgeDaoTest/delete_file_sources_of_disabled_resources-result.xml (55%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/purge/PurgeDaoTest/delete_file_sources_of_disabled_resources.xml (92%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/purge/PurgeDaoTest/disable_resources_without_last_snapshot-result.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/purge/PurgeDaoTest/disable_resources_without_last_snapshot.xml (68%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/purge/PurgeDaoTest/select_purgeable_file_uuids.xml (96%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/purge/PurgeDaoTest/shouldDeleteAbortedBuilds-result.xml (65%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/purge/PurgeDaoTest/shouldDeleteAbortedBuilds.xml (87%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/purge/PurgeDaoTest/shouldDeleteHistoricalDataOfDirectoriesAndFiles-result.xml (60%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/purge/PurgeDaoTest/shouldDeleteHistoricalDataOfDirectoriesAndFiles.xml (80%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/purge/PurgeDaoTest/shouldDeleteProject.xml (99%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/purge/PurgeDaoTest/shouldDeleteSnapshots-result.xml (91%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/purge/PurgeDaoTest/shouldDeleteSnapshots.xml (88%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/purge/PurgeDaoTest/shouldPurgeProject-result.xml (84%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/purge/PurgeDaoTest/shouldPurgeProject.xml (82%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/purge/PurgeDaoTest/shouldSelectPurgeableSnapshots.xml (87%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/purge/PurgeDaoTest/should_delete_all_closed_issues-result.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/purge/PurgeDaoTest/should_delete_all_closed_issues.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/purge/PurgeDaoTest/should_delete_old_closed_issues-result.xml (72%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/purge/PurgeDaoTest/should_delete_old_closed_issues.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core/qualitygate/db => sonar-db/src/test/resources/org/sonar/db/qualitygate}/ProjectQgateAssociationDaoTest/shared.xml (78%) create mode 100644 sonar-db/src/test/resources/org/sonar/db/qualitygate/QualityGateConditionDaoTest/delete-result.xml rename {sonar-core/src/test/resources/org/sonar/core/qualitygate/db => sonar-db/src/test/resources/org/sonar/db/qualitygate}/QualityGateConditionDaoTest/insert-result.xml (50%) rename {sonar-core/src/test/resources/org/sonar/core/qualitygate/db/QualityGateDaoTest => sonar-db/src/test/resources/org/sonar/db/qualitygate/QualityGateConditionDaoTest}/insert.xml (100%) create mode 100644 sonar-db/src/test/resources/org/sonar/db/qualitygate/QualityGateConditionDaoTest/selectForQualityGate.xml rename {sonar-core/src/test/resources/org/sonar/core/qualitygate/db => sonar-db/src/test/resources/org/sonar/db/qualitygate}/QualityGateConditionDaoTest/shouldCleanConditions-result.xml (56%) create mode 100644 sonar-db/src/test/resources/org/sonar/db/qualitygate/QualityGateConditionDaoTest/shouldCleanConditions.xml create mode 100644 sonar-db/src/test/resources/org/sonar/db/qualitygate/QualityGateConditionDaoTest/update-result.xml create mode 100644 sonar-db/src/test/resources/org/sonar/db/qualitygate/QualityGateDaoTest/delete-result.xml create mode 100644 sonar-db/src/test/resources/org/sonar/db/qualitygate/QualityGateDaoTest/insert-result.xml rename {sonar-core/src/test/resources/org/sonar/core/resource/ResourceDaoTest => sonar-db/src/test/resources/org/sonar/db/qualitygate/QualityGateDaoTest}/insert.xml (100%) create mode 100644 sonar-db/src/test/resources/org/sonar/db/qualitygate/QualityGateDaoTest/selectAll.xml create mode 100644 sonar-db/src/test/resources/org/sonar/db/qualitygate/QualityGateDaoTest/update-result.xml rename {sonar-core/src/test/resources/org/sonar/core/qualityprofile/db => sonar-db/src/test/resources/org/sonar/db/qualityprofile}/ActiveRuleDaoTest/delete-result.xml (63%) rename {sonar-core/src/test/resources/org/sonar/core/qualityprofile/db => sonar-db/src/test/resources/org/sonar/db/qualityprofile}/ActiveRuleDaoTest/delete_from_profile-result.xml (80%) rename {sonar-core/src/test/resources/org/sonar/core/qualityprofile/db => sonar-db/src/test/resources/org/sonar/db/qualityprofile}/ActiveRuleDaoTest/delete_from_rule-result.xml (63%) rename {sonar-core/src/test/resources/org/sonar/core/qualityprofile/db => sonar-db/src/test/resources/org/sonar/db/qualityprofile}/ActiveRuleDaoTest/delete_parameter-result.xml (74%) rename {sonar-core/src/test/resources/org/sonar/core/qualityprofile/db => sonar-db/src/test/resources/org/sonar/db/qualityprofile}/ActiveRuleDaoTest/delete_parameters-result.xml (75%) rename {sonar-core/src/test/resources/org/sonar/core/qualityprofile/db => sonar-db/src/test/resources/org/sonar/db/qualityprofile}/ActiveRuleDaoTest/delete_parameters_from_profile_id-result.xml (74%) rename {sonar-core/src/test/resources/org/sonar/core/qualityprofile/db => sonar-db/src/test/resources/org/sonar/db/qualityprofile}/ActiveRuleDaoTest/delete_parameters_from_profile_id.xml (73%) rename {sonar-core/src/test/resources/org/sonar/core/qualityprofile/db => sonar-db/src/test/resources/org/sonar/db/qualityprofile}/ActiveRuleDaoTest/empty.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core/qualityprofile/db => sonar-db/src/test/resources/org/sonar/db/qualityprofile}/ActiveRuleDaoTest/insert-result.xml (50%) rename {sonar-core/src/test/resources/org/sonar/core/qualityprofile/db => sonar-db/src/test/resources/org/sonar/db/qualityprofile}/ActiveRuleDaoTest/insert_parameter-result.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core/qualityprofile/db => sonar-db/src/test/resources/org/sonar/db/qualityprofile}/ActiveRuleDaoTest/shared.xml (76%) create mode 100644 sonar-db/src/test/resources/org/sonar/db/qualityprofile/ActiveRuleDaoTest/update-result.xml rename {sonar-core/src/test/resources/org/sonar/core/qualityprofile/db => sonar-db/src/test/resources/org/sonar/db/qualityprofile}/ActiveRuleDaoTest/update_parameter-result.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core/qualityprofile/db => sonar-db/src/test/resources/org/sonar/db/qualityprofile}/QualityProfileDaoTest/delete-result.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core/qualityprofile/db => sonar-db/src/test/resources/org/sonar/db/qualityprofile}/QualityProfileDaoTest/inheritance.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core/qualityprofile/db => sonar-db/src/test/resources/org/sonar/db/qualityprofile}/QualityProfileDaoTest/insert-result.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core/qualityprofile/db => sonar-db/src/test/resources/org/sonar/db/qualityprofile}/QualityProfileDaoTest/projects.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core/qualityprofile/db => sonar-db/src/test/resources/org/sonar/db/qualityprofile}/QualityProfileDaoTest/select_all_is_sorted_by_profile_name.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core/qualityprofile/db => sonar-db/src/test/resources/org/sonar/db/qualityprofile}/QualityProfileDaoTest/select_by_language.xml (77%) rename {sonar-core/src/test/resources/org/sonar/core/qualityprofile/db => sonar-db/src/test/resources/org/sonar/db/qualityprofile}/QualityProfileDaoTest/shared.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core/qualityprofile/db => sonar-db/src/test/resources/org/sonar/db/qualityprofile}/QualityProfileDaoTest/update-result.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/rule/RuleDaoTest/empty.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/rule/RuleDaoTest/insert-result.xml (72%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/rule/RuleDaoTest/insert_all-result.xml (82%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/rule/RuleDaoTest/insert_parameter-result.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/rule/RuleDaoTest/insert_parameter.xml (100%) create mode 100644 sonar-db/src/test/resources/org/sonar/db/rule/RuleDaoTest/selectAll.xml create mode 100644 sonar-db/src/test/resources/org/sonar/db/rule/RuleDaoTest/selectById.xml create mode 100644 sonar-db/src/test/resources/org/sonar/db/rule/RuleDaoTest/selectNonManual.xml create mode 100644 sonar-db/src/test/resources/org/sonar/db/rule/RuleDaoTest/selectParameters.xml create mode 100644 sonar-db/src/test/resources/org/sonar/db/rule/RuleDaoTest/select_by_name.xml create mode 100644 sonar-db/src/test/resources/org/sonar/db/rule/RuleDaoTest/select_by_rule_key.xml rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/rule/RuleDaoTest/select_by_sub_characteristic_id.xml (70%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/rule/RuleDaoTest/select_enables_and_non_manual.xml (78%) create mode 100644 sonar-db/src/test/resources/org/sonar/db/rule/RuleDaoTest/select_parameters_by_rule_id.xml create mode 100644 sonar-db/src/test/resources/org/sonar/db/rule/RuleDaoTest/select_parameters_by_rule_ids.xml create mode 100644 sonar-db/src/test/resources/org/sonar/db/rule/RuleDaoTest/update-result.xml create mode 100644 sonar-db/src/test/resources/org/sonar/db/rule/RuleDaoTest/update.xml create mode 100644 sonar-db/src/test/resources/org/sonar/db/rule/RuleDaoTest/update_parameter-result.xml rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/rule/RuleDaoTest/update_parameter.xml (100%) create mode 100644 sonar-db/src/test/resources/org/sonar/db/semaphore/SemaphoreDaoTest/old_semaphore.xml rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/user/AuthorDaoTest/add_missing_module_uuid_path-result.xml (59%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/user/AuthorDaoTest/add_missing_module_uuid_path.xml (100%) create mode 100644 sonar-db/src/test/resources/org/sonar/db/user/AuthorDaoTest/countDeveloperLogins.xml rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/user/AuthorDaoTest/shouldInsertAuthor-result.xml (75%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/user/AuthorDaoTest/shouldInsertAuthor.xml (100%) create mode 100644 sonar-db/src/test/resources/org/sonar/db/user/AuthorDaoTest/shouldInsertAuthorAndDeveloper-result.xml rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/user/AuthorDaoTest/shouldInsertAuthorAndDeveloper.xml (100%) create mode 100644 sonar-db/src/test/resources/org/sonar/db/user/AuthorDaoTest/shouldPreventAuthorsAndDevelopersDuplication-result.xml create mode 100644 sonar-db/src/test/resources/org/sonar/db/user/AuthorDaoTest/shouldPreventAuthorsAndDevelopersDuplication.xml create mode 100644 sonar-db/src/test/resources/org/sonar/db/user/AuthorDaoTest/shouldPreventAuthorsDuplication-result.xml create mode 100644 sonar-db/src/test/resources/org/sonar/db/user/AuthorDaoTest/shouldPreventAuthorsDuplication.xml rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/user/AuthorDaoTest/shouldSelectByLogin.xml (75%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/user/AuthorizationDaoTest/anonymous_should_be_authorized.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/user/AuthorizationDaoTest/group_should_be_authorized.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/user/AuthorizationDaoTest/is_authorized_component_key_for_global_permission.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/user/AuthorizationDaoTest/keep_authorized_project_ids_for_anonymous.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/user/AuthorizationDaoTest/keep_authorized_project_ids_for_group.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/user/AuthorizationDaoTest/keep_authorized_project_ids_for_user.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/user/AuthorizationDaoTest/should_return_global_permissions_for_anonymous.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/user/AuthorizationDaoTest/should_return_global_permissions_for_group_anyone.xml (85%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/user/AuthorizationDaoTest/should_return_group_global_permissions.xml (90%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/user/AuthorizationDaoTest/should_return_root_project_keys_for_anonymous.xml (71%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/user/AuthorizationDaoTest/should_return_root_project_keys_for_group.xml (75%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/user/AuthorizationDaoTest/should_return_root_project_keys_for_user.xml (73%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/user/AuthorizationDaoTest/should_return_user_global_permissions.xml (89%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/user/AuthorizationDaoTest/user_should_be_authorized.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/user/GroupMembershipDaoTest/select_user_group.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/user/GroupMembershipDaoTest/shared.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/user/GroupMembershipDaoTest/shared_plus_empty_group.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/user/GroupMembershipDaoTest/should_be_sorted_by_group_name.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/user/RoleDaoTest/deleteGroupPermissionsByGroupId-result.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/user/RoleDaoTest/deleteGroupPermissionsByGroupId.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/user/RoleDaoTest/globalGroupPermissions-result.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/user/RoleDaoTest/globalGroupPermissions.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/user/RoleDaoTest/globalUserPermissions-result.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/user/RoleDaoTest/globalUserPermissions.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/user/RoleDaoTest/resourceGroupPermissions-result.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/user/RoleDaoTest/resourceGroupPermissions.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/user/RoleDaoTest/resourceUserPermissions-result.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/user/RoleDaoTest/resourceUserPermissions.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/user/RoleMapperTest/countRoles.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/user/RoleMapperTest/deleteRolesByResourceId-result.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/user/RoleMapperTest/deleteRolesByResourceId.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/user/RoleMapperTest/insertRoles-result.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/user/RoleMapperTest/insertRoles.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/user/UserDaoTest/deactivate_user-result.xml (72%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/user/UserDaoTest/deactivate_user.xml (64%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/user/UserDaoTest/insert-result.xml (52%) create mode 100644 sonar-db/src/test/resources/org/sonar/db/user/UserDaoTest/selectActiveUserByLogin.xml rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/user/UserDaoTest/selectGroupByName.xml (72%) create mode 100644 sonar-db/src/test/resources/org/sonar/db/user/UserDaoTest/selectUsersByLogins.xml create mode 100644 sonar-db/src/test/resources/org/sonar/db/user/UserDaoTest/selectUsersByQuery.xml create mode 100644 sonar-db/src/test/resources/org/sonar/db/user/UserDaoTest/selectUsersByText.xml rename {sonar-core/src/test/resources/org/sonar/core => sonar-db/src/test/resources/org/sonar/db}/user/UserDaoTest/update_user.xml (52%) rename {sonar-core/src/test/resources/org/sonar/core/persistence => sonar-db/src/test/resources/org/sonar/db/version}/DatabaseVersionTest/getVersion.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core/persistence => sonar-db/src/test/resources/org/sonar/db/version}/DatabaseVersionTest/getVersion_no_rows.xml (100%) rename {sonar-core => sonar-db}/src/test/resources/org/sonar/jpa/dao/ProfilesDaoTest/shouldGetProfiles.xml (100%) diff --git a/microbenchmark-template/pom.xml b/microbenchmark-template/pom.xml index 261b3d4a58d..3a23a5b48a4 100644 --- a/microbenchmark-template/pom.xml +++ b/microbenchmark-template/pom.xml @@ -28,7 +28,7 @@ ${project.groupId} - sonar-core + sonar-db ${project.version} diff --git a/pom.xml b/pom.xml index 866dc476ae3..f5bf84e12c1 100644 --- a/pom.xml +++ b/pom.xml @@ -20,6 +20,7 @@ sonar-check-api sonar-colorizer sonar-core + sonar-db sonar-duplications sonar-home sonar-markdown @@ -606,6 +607,11 @@ sonar-core ${project.version} + + org.codehaus.sonar + sonar-db + ${project.version} + org.codehaus.sonar sonar-batch-protocol diff --git a/server/sonar-server-benchmarks/pom.xml b/server/sonar-server-benchmarks/pom.xml index a12a517dcf8..2a93d45402c 100644 --- a/server/sonar-server-benchmarks/pom.xml +++ b/server/sonar-server-benchmarks/pom.xml @@ -18,7 +18,7 @@ org.codehaus.sonar - sonar-core + sonar-db test-jar ${project.version} test diff --git a/server/sonar-server-benchmarks/src/test/java/org/sonar/server/benchmark/PersistFileSourcesStepTest.java b/server/sonar-server-benchmarks/src/test/java/org/sonar/server/benchmark/PersistFileSourcesStepTest.java index e0f65824a4a..d520fba19e0 100644 --- a/server/sonar-server-benchmarks/src/test/java/org/sonar/server/benchmark/PersistFileSourcesStepTest.java +++ b/server/sonar-server-benchmarks/src/test/java/org/sonar/server/benchmark/PersistFileSourcesStepTest.java @@ -35,7 +35,7 @@ import org.sonar.api.utils.internal.Uuids; import org.sonar.batch.protocol.Constants; import org.sonar.batch.protocol.output.BatchReport; import org.sonar.batch.protocol.output.BatchReportWriter; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.DbTester; import org.sonar.server.computation.batch.BatchReportDirectoryHolderImpl; import org.sonar.server.computation.batch.BatchReportReaderImpl; import org.sonar.server.computation.batch.TreeRootHolderRule; diff --git a/server/sonar-server-benchmarks/src/test/java/org/sonar/server/benchmark/SourceDbBenchmarkTest.java b/server/sonar-server-benchmarks/src/test/java/org/sonar/server/benchmark/SourceDbBenchmarkTest.java index e6e8885e010..1bef6b936d8 100644 --- a/server/sonar-server-benchmarks/src/test/java/org/sonar/server/benchmark/SourceDbBenchmarkTest.java +++ b/server/sonar-server-benchmarks/src/test/java/org/sonar/server/benchmark/SourceDbBenchmarkTest.java @@ -26,8 +26,8 @@ import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.sonar.api.utils.internal.Uuids; -import org.sonar.core.persistence.DbTester; -import org.sonar.core.source.db.FileSourceDto; +import org.sonar.db.DbTester; +import org.sonar.db.source.FileSourceDto; import org.sonar.server.db.DbClient; import org.sonar.server.source.db.FileSourceDao; import org.sonar.server.source.db.FileSourceDb; diff --git a/server/sonar-server/pom.xml b/server/sonar-server/pom.xml index 880cded9f14..b672cb37739 100644 --- a/server/sonar-server/pom.xml +++ b/server/sonar-server/pom.xml @@ -72,6 +72,10 @@ org.codehaus.sonar sonar-core + + org.codehaus.sonar + sonar-db + org.codehaus.sonar sonar-batch-protocol @@ -181,7 +185,7 @@ org.codehaus.sonar - sonar-core + sonar-db ${project.version} test-jar test diff --git a/server/sonar-server/src/main/java/org/sonar/core/computation/dbcleaner/IndexPurgeListener.java b/server/sonar-server/src/main/java/org/sonar/core/computation/dbcleaner/IndexPurgeListener.java index 959e55c0b72..31752ec2d05 100644 --- a/server/sonar-server/src/main/java/org/sonar/core/computation/dbcleaner/IndexPurgeListener.java +++ b/server/sonar-server/src/main/java/org/sonar/core/computation/dbcleaner/IndexPurgeListener.java @@ -21,7 +21,7 @@ package org.sonar.core.computation.dbcleaner; import org.sonar.api.server.ServerSide; -import org.sonar.core.purge.PurgeListener; +import org.sonar.db.purge.PurgeListener; import org.sonar.server.source.index.SourceLineIndexer; import org.sonar.server.test.index.TestIndexer; diff --git a/server/sonar-server/src/main/java/org/sonar/core/computation/dbcleaner/ProjectCleaner.java b/server/sonar-server/src/main/java/org/sonar/core/computation/dbcleaner/ProjectCleaner.java index 06045818a17..b8dc2920284 100644 --- a/server/sonar-server/src/main/java/org/sonar/core/computation/dbcleaner/ProjectCleaner.java +++ b/server/sonar-server/src/main/java/org/sonar/core/computation/dbcleaner/ProjectCleaner.java @@ -28,16 +28,16 @@ import org.sonar.api.server.ServerSide; import org.sonar.api.utils.TimeUtils; import org.sonar.api.utils.log.Logger; import org.sonar.api.utils.log.Loggers; -import org.sonar.core.computation.dbcleaner.period.DefaultPeriodCleaner; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.purge.IdUuidPair; -import org.sonar.core.purge.PurgeConfiguration; -import org.sonar.core.purge.PurgeDao; -import org.sonar.core.purge.PurgeListener; -import org.sonar.core.purge.PurgeProfiler; +import org.sonar.db.purge.period.DefaultPeriodCleaner; +import org.sonar.db.DbSession; +import org.sonar.db.purge.IdUuidPair; +import org.sonar.db.purge.PurgeConfiguration; +import org.sonar.db.purge.PurgeDao; +import org.sonar.db.purge.PurgeListener; +import org.sonar.db.purge.PurgeProfiler; import org.sonar.server.issue.index.IssueIndex; -import static org.sonar.core.purge.PurgeConfiguration.newDefaultPurgeConfiguration; +import static org.sonar.db.purge.PurgeConfiguration.newDefaultPurgeConfiguration; @ServerSide public class ProjectCleaner { diff --git a/server/sonar-server/src/main/java/org/sonar/server/activity/ActivityService.java b/server/sonar-server/src/main/java/org/sonar/server/activity/ActivityService.java index 950a6e16140..0aa9be22946 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/activity/ActivityService.java +++ b/server/sonar-server/src/main/java/org/sonar/server/activity/ActivityService.java @@ -22,7 +22,7 @@ package org.sonar.server.activity; import org.sonar.api.server.ServerSide; import org.sonar.api.utils.KeyValueFormat; import org.sonar.api.utils.internal.Uuids; -import org.sonar.core.activity.db.ActivityDto; +import org.sonar.db.activity.ActivityDto; import org.sonar.server.activity.index.ActivityIndexer; import org.sonar.server.db.DbClient; import org.sonar.server.user.UserSession; diff --git a/server/sonar-server/src/main/java/org/sonar/server/activity/db/ActivityDao.java b/server/sonar-server/src/main/java/org/sonar/server/activity/db/ActivityDao.java index 35c7548df61..c2043ce16ba 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/activity/db/ActivityDao.java +++ b/server/sonar-server/src/main/java/org/sonar/server/activity/db/ActivityDao.java @@ -21,16 +21,16 @@ package org.sonar.server.activity.db; import org.sonar.api.server.ServerSide; import org.sonar.api.utils.System2; -import org.sonar.core.activity.db.ActivityDto; -import org.sonar.core.activity.db.ActivityMapper; -import org.sonar.core.persistence.DaoComponent; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.MyBatis; +import org.sonar.db.activity.ActivityDto; +import org.sonar.db.activity.ActivityMapper; +import org.sonar.db.Dao; +import org.sonar.db.DbSession; +import org.sonar.db.MyBatis; import java.util.Date; @ServerSide -public class ActivityDao implements DaoComponent { +public class ActivityDao implements Dao { private final MyBatis mybatis; private final System2 system; diff --git a/server/sonar-server/src/main/java/org/sonar/server/activity/index/ActivityIndexer.java b/server/sonar-server/src/main/java/org/sonar/server/activity/index/ActivityIndexer.java index 81f9d3b85bc..d2b791292ec 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/activity/index/ActivityIndexer.java +++ b/server/sonar-server/src/main/java/org/sonar/server/activity/index/ActivityIndexer.java @@ -19,7 +19,7 @@ */ package org.sonar.server.activity.index; -import org.sonar.core.persistence.DbSession; +import org.sonar.db.DbSession; import org.sonar.server.db.DbClient; import org.sonar.server.es.BaseIndexer; import org.sonar.server.es.BulkIndexer; diff --git a/server/sonar-server/src/main/java/org/sonar/server/batch/BatchWsModule.java b/server/sonar-server/src/main/java/org/sonar/server/batch/BatchWsModule.java index ebc0445137c..8357272f318 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/batch/BatchWsModule.java +++ b/server/sonar-server/src/main/java/org/sonar/server/batch/BatchWsModule.java @@ -19,7 +19,7 @@ */ package org.sonar.server.batch; -import org.sonar.core.component.Module; +import org.sonar.core.platform.Module; import org.sonar.server.computation.ws.SubmitReportAction; public class BatchWsModule extends Module { diff --git a/server/sonar-server/src/main/java/org/sonar/server/batch/GlobalAction.java b/server/sonar-server/src/main/java/org/sonar/server/batch/GlobalAction.java index c87da9be3a7..4b6915e7e7d 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/batch/GlobalAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/batch/GlobalAction.java @@ -25,12 +25,12 @@ import org.sonar.api.server.ws.Request; import org.sonar.api.server.ws.Response; import org.sonar.api.server.ws.WebService; import org.sonar.batch.protocol.input.GlobalRepositories; -import org.sonar.core.metric.db.MetricDto; +import org.sonar.db.metric.MetricDto; import org.sonar.core.permission.GlobalPermissions; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.MyBatis; -import org.sonar.core.properties.PropertiesDao; -import org.sonar.core.properties.PropertyDto; +import org.sonar.db.DbSession; +import org.sonar.db.MyBatis; +import org.sonar.db.property.PropertiesDao; +import org.sonar.db.property.PropertyDto; import org.sonar.server.db.DbClient; import org.sonar.server.exceptions.ForbiddenException; import org.sonar.server.plugins.MimeTypes; diff --git a/server/sonar-server/src/main/java/org/sonar/server/batch/IssuesAction.java b/server/sonar-server/src/main/java/org/sonar/server/batch/IssuesAction.java index 9290df18a26..05e9f0482a7 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/batch/IssuesAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/batch/IssuesAction.java @@ -25,10 +25,10 @@ import org.sonar.api.server.ws.Request; import org.sonar.api.server.ws.Response; import org.sonar.api.server.ws.WebService; import org.sonar.batch.protocol.input.BatchInput; -import org.sonar.core.component.ComponentDto; +import org.sonar.db.component.ComponentDto; import org.sonar.core.permission.GlobalPermissions; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.MyBatis; +import org.sonar.db.DbSession; +import org.sonar.db.MyBatis; import org.sonar.server.db.DbClient; import org.sonar.server.issue.index.IssueDoc; import org.sonar.server.issue.index.IssueIndex; diff --git a/server/sonar-server/src/main/java/org/sonar/server/batch/ProjectRepositoryLoader.java b/server/sonar-server/src/main/java/org/sonar/server/batch/ProjectRepositoryLoader.java index 96df12e00e1..933414d025b 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/batch/ProjectRepositoryLoader.java +++ b/server/sonar-server/src/main/java/org/sonar/server/batch/ProjectRepositoryLoader.java @@ -39,14 +39,14 @@ import org.sonar.api.utils.log.Loggers; import org.sonar.api.web.UserRole; import org.sonar.batch.protocol.input.FileData; import org.sonar.batch.protocol.input.ProjectRepositories; -import org.sonar.core.UtcDateUtils; -import org.sonar.core.component.ComponentDto; -import org.sonar.core.component.FilePathWithHashDto; +import org.sonar.core.util.UtcDateUtils; +import org.sonar.db.component.ComponentDto; +import org.sonar.db.component.FilePathWithHashDto; import org.sonar.core.permission.GlobalPermissions; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.MyBatis; -import org.sonar.core.properties.PropertyDto; -import org.sonar.core.qualityprofile.db.QualityProfileDto; +import org.sonar.db.DbSession; +import org.sonar.db.MyBatis; +import org.sonar.db.property.PropertyDto; +import org.sonar.db.qualityprofile.QualityProfileDto; import org.sonar.server.db.DbClient; import org.sonar.server.exceptions.ForbiddenException; import org.sonar.server.qualityprofile.ActiveRule; diff --git a/server/sonar-server/src/main/java/org/sonar/server/component/ComponentCleanerService.java b/server/sonar-server/src/main/java/org/sonar/server/component/ComponentCleanerService.java index 5fae0d7fadd..b318762647f 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/component/ComponentCleanerService.java +++ b/server/sonar-server/src/main/java/org/sonar/server/component/ComponentCleanerService.java @@ -24,10 +24,10 @@ import org.sonar.api.server.ServerSide; import org.sonar.api.resources.ResourceType; import org.sonar.api.resources.ResourceTypes; import org.sonar.api.resources.Scopes; -import org.sonar.core.component.ComponentDto; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.MyBatis; -import org.sonar.core.purge.IdUuidPair; +import org.sonar.db.component.ComponentDto; +import org.sonar.db.DbSession; +import org.sonar.db.MyBatis; +import org.sonar.db.purge.IdUuidPair; import org.sonar.server.db.DbClient; import org.sonar.server.issue.index.IssueAuthorizationIndexer; import org.sonar.server.issue.index.IssueIndexer; diff --git a/server/sonar-server/src/main/java/org/sonar/server/component/ComponentService.java b/server/sonar-server/src/main/java/org/sonar/server/component/ComponentService.java index b381c7f8e9f..6e51c44b994 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/component/ComponentService.java +++ b/server/sonar-server/src/main/java/org/sonar/server/component/ComponentService.java @@ -38,12 +38,12 @@ import org.sonar.api.server.ServerSide; import org.sonar.api.utils.System2; import org.sonar.api.utils.internal.Uuids; import org.sonar.api.web.UserRole; -import org.sonar.core.component.ComponentDto; +import org.sonar.db.component.ComponentDto; import org.sonar.core.component.ComponentKeys; import org.sonar.core.permission.GlobalPermissions; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.resource.ResourceIndexerDao; -import org.sonar.core.resource.ResourceKeyUpdaterDao; +import org.sonar.db.DbSession; +import org.sonar.db.component.ResourceIndexerDao; +import org.sonar.db.component.ResourceKeyUpdaterDao; import org.sonar.server.db.DbClient; import org.sonar.server.exceptions.BadRequestException; import org.sonar.server.exceptions.NotFoundException; diff --git a/server/sonar-server/src/main/java/org/sonar/server/component/DefaultRubyComponentService.java b/server/sonar-server/src/main/java/org/sonar/server/component/DefaultRubyComponentService.java index 210c7eb9d3f..31a9266c07f 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/component/DefaultRubyComponentService.java +++ b/server/sonar-server/src/main/java/org/sonar/server/component/DefaultRubyComponentService.java @@ -27,9 +27,9 @@ import javax.annotation.Nullable; import org.sonar.api.component.Component; import org.sonar.api.component.RubyComponentService; import org.sonar.api.resources.Qualifiers; -import org.sonar.core.component.ComponentDto; -import org.sonar.core.resource.ResourceDao; -import org.sonar.core.resource.ResourceDto; +import org.sonar.db.component.ComponentDto; +import org.sonar.db.component.ResourceDao; +import org.sonar.db.component.ResourceDto; import org.sonar.server.exceptions.BadRequestException; import org.sonar.server.permission.InternalPermissionService; import org.sonar.server.util.RubyUtils; diff --git a/server/sonar-server/src/main/java/org/sonar/server/component/db/ComponentDao.java b/server/sonar-server/src/main/java/org/sonar/server/component/db/ComponentDao.java index 1bcabb07020..85d7feccbc1 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/component/db/ComponentDao.java +++ b/server/sonar-server/src/main/java/org/sonar/server/component/db/ComponentDao.java @@ -32,13 +32,13 @@ import org.apache.ibatis.session.RowBounds; import org.sonar.api.resources.Qualifiers; import org.sonar.api.resources.Scopes; import org.sonar.api.server.ServerSide; -import org.sonar.core.component.ComponentDto; -import org.sonar.core.component.FilePathWithHashDto; -import org.sonar.core.component.UuidWithProjectUuidDto; -import org.sonar.core.component.db.ComponentMapper; -import org.sonar.core.persistence.DaoComponent; -import org.sonar.core.persistence.DaoUtils; -import org.sonar.core.persistence.DbSession; +import org.sonar.db.component.ComponentDto; +import org.sonar.db.component.FilePathWithHashDto; +import org.sonar.db.component.UuidWithProjectUuidDto; +import org.sonar.db.component.ComponentMapper; +import org.sonar.db.Dao; +import org.sonar.db.DaoUtils; +import org.sonar.db.DbSession; import org.sonar.server.es.SearchOptions; import org.sonar.server.exceptions.NotFoundException; @@ -48,7 +48,7 @@ import static com.google.common.collect.Maps.newHashMapWithExpectedSize; * @since 4.3 */ @ServerSide -public class ComponentDao implements DaoComponent { +public class ComponentDao implements Dao { public ComponentDto selectById(Long id, DbSession session) { ComponentDto componentDto = selectNullableById(id, session); diff --git a/server/sonar-server/src/main/java/org/sonar/server/component/db/ComponentIndexDao.java b/server/sonar-server/src/main/java/org/sonar/server/component/db/ComponentIndexDao.java index f091ee7775a..0ec4e5f9703 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/component/db/ComponentIndexDao.java +++ b/server/sonar-server/src/main/java/org/sonar/server/component/db/ComponentIndexDao.java @@ -21,14 +21,14 @@ package org.sonar.server.component.db; import org.sonar.api.server.ServerSide; -import org.sonar.core.component.db.ComponentIndexMapper; -import org.sonar.core.persistence.DaoComponent; -import org.sonar.core.persistence.DbSession; +import org.sonar.db.component.ComponentIndexMapper; +import org.sonar.db.Dao; +import org.sonar.db.DbSession; import java.util.List; @ServerSide -public class ComponentIndexDao implements DaoComponent { +public class ComponentIndexDao implements Dao { public List selectProjectIdsFromQueryAndViewOrSubViewUuid(DbSession session, String query, String viewOrSubViewUuid) { return session.getMapper(ComponentIndexMapper.class).selectProjectIdsFromQueryAndViewOrSubViewUuid(query + "%", "%." + viewOrSubViewUuid + ".%"); diff --git a/server/sonar-server/src/main/java/org/sonar/server/component/db/ComponentLinkDao.java b/server/sonar-server/src/main/java/org/sonar/server/component/db/ComponentLinkDao.java index d4039410d35..18662e8d9c2 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/component/db/ComponentLinkDao.java +++ b/server/sonar-server/src/main/java/org/sonar/server/component/db/ComponentLinkDao.java @@ -21,15 +21,15 @@ package org.sonar.server.component.db; import org.sonar.api.server.ServerSide; -import org.sonar.core.component.ComponentLinkDto; -import org.sonar.core.component.db.ComponentLinkMapper; -import org.sonar.core.persistence.DaoComponent; -import org.sonar.core.persistence.DbSession; +import org.sonar.db.component.ComponentLinkDto; +import org.sonar.db.component.ComponentLinkMapper; +import org.sonar.db.Dao; +import org.sonar.db.DbSession; import java.util.List; @ServerSide -public class ComponentLinkDao implements DaoComponent { +public class ComponentLinkDao implements Dao { public List selectByComponentUuid(DbSession session, String componentUuid) { return session.getMapper(ComponentLinkMapper.class).selectByComponentUuid(componentUuid); diff --git a/server/sonar-server/src/main/java/org/sonar/server/component/db/SnapshotDao.java b/server/sonar-server/src/main/java/org/sonar/server/component/db/SnapshotDao.java index 0b3247128e7..4be141c5a03 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/component/db/SnapshotDao.java +++ b/server/sonar-server/src/main/java/org/sonar/server/component/db/SnapshotDao.java @@ -27,14 +27,14 @@ import java.util.List; import javax.annotation.CheckForNull; import javax.annotation.Nullable; import org.sonar.api.resources.Scopes; -import org.sonar.core.component.SnapshotDto; -import org.sonar.core.component.db.SnapshotMapper; -import org.sonar.core.component.db.SnapshotQuery; -import org.sonar.core.persistence.DaoComponent; -import org.sonar.core.persistence.DbSession; +import org.sonar.db.component.SnapshotDto; +import org.sonar.db.component.SnapshotMapper; +import org.sonar.db.component.SnapshotQuery; +import org.sonar.db.Dao; +import org.sonar.db.DbSession; import org.sonar.server.exceptions.NotFoundException; -public class SnapshotDao implements DaoComponent { +public class SnapshotDao implements Dao { @CheckForNull public SnapshotDto selectNullableById(DbSession session, Long id) { diff --git a/server/sonar-server/src/main/java/org/sonar/server/component/ws/AppAction.java b/server/sonar-server/src/main/java/org/sonar/server/component/ws/AppAction.java index 95d920b3a04..c038041f521 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/component/ws/AppAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/component/ws/AppAction.java @@ -35,12 +35,12 @@ import org.sonar.api.server.ws.WebService; import org.sonar.api.utils.Durations; import org.sonar.api.utils.text.JsonWriter; import org.sonar.api.web.UserRole; -import org.sonar.core.component.ComponentDto; -import org.sonar.core.measure.db.MeasureDto; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.MyBatis; -import org.sonar.core.properties.PropertyDto; -import org.sonar.core.properties.PropertyQuery; +import org.sonar.db.component.ComponentDto; +import org.sonar.db.measure.MeasureDto; +import org.sonar.db.DbSession; +import org.sonar.db.MyBatis; +import org.sonar.db.property.PropertyDto; +import org.sonar.db.property.PropertyQuery; import org.sonar.server.db.DbClient; import org.sonar.server.exceptions.NotFoundException; import org.sonar.server.user.UserSession; diff --git a/server/sonar-server/src/main/java/org/sonar/server/component/ws/ComponentJsonWriter.java b/server/sonar-server/src/main/java/org/sonar/server/component/ws/ComponentJsonWriter.java index 04ca8b22699..01bf01a4e0e 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/component/ws/ComponentJsonWriter.java +++ b/server/sonar-server/src/main/java/org/sonar/server/component/ws/ComponentJsonWriter.java @@ -20,7 +20,7 @@ package org.sonar.server.component.ws; import org.sonar.api.utils.text.JsonWriter; -import org.sonar.core.component.ComponentDto; +import org.sonar.db.component.ComponentDto; public class ComponentJsonWriter { diff --git a/server/sonar-server/src/main/java/org/sonar/server/component/ws/SearchAction.java b/server/sonar-server/src/main/java/org/sonar/server/component/ws/SearchAction.java index 3b398223e33..9610ad35a30 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/component/ws/SearchAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/component/ws/SearchAction.java @@ -31,9 +31,9 @@ import org.sonar.api.server.ws.WebService; import org.sonar.api.server.ws.WebService.Param; import org.sonar.api.utils.text.JsonWriter; import org.sonar.api.web.UserRole; -import org.sonar.core.component.ComponentDto; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.MyBatis; +import org.sonar.db.component.ComponentDto; +import org.sonar.db.DbSession; +import org.sonar.db.MyBatis; import org.sonar.server.db.DbClient; import org.sonar.server.es.SearchOptions; import org.sonar.server.user.UserSession; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/ComputationService.java b/server/sonar-server/src/main/java/org/sonar/server/computation/ComputationService.java index 174e8886312..9daf008e58f 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/ComputationService.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/ComputationService.java @@ -29,8 +29,8 @@ import org.sonar.server.computation.activity.ActivityManager; import org.sonar.server.computation.step.ComputationStep; import org.sonar.server.computation.step.ComputationSteps; -import static org.sonar.core.computation.db.AnalysisReportDto.Status.FAILED; -import static org.sonar.core.computation.db.AnalysisReportDto.Status.SUCCESS; +import static org.sonar.db.compute.AnalysisReportDto.Status.FAILED; +import static org.sonar.db.compute.AnalysisReportDto.Status.SUCCESS; @ServerSide public class ComputationService { diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/ReportQueue.java b/server/sonar-server/src/main/java/org/sonar/server/computation/ReportQueue.java index ceb6f615457..cb08dcf7b24 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/ReportQueue.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/ReportQueue.java @@ -30,14 +30,14 @@ import org.sonar.api.config.Settings; import org.sonar.api.server.ServerSide; import org.sonar.api.utils.internal.Uuids; import org.sonar.api.utils.log.Loggers; -import org.sonar.core.computation.db.AnalysisReportDto; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.MyBatis; +import org.sonar.db.compute.AnalysisReportDto; +import org.sonar.db.DbSession; +import org.sonar.db.MyBatis; import org.sonar.process.ProcessProperties; import org.sonar.server.computation.db.AnalysisReportDao; import org.sonar.server.db.DbClient; -import static org.sonar.core.computation.db.AnalysisReportDto.Status.PENDING; +import static org.sonar.db.compute.AnalysisReportDto.Status.PENDING; @ServerSide public class ReportQueue { diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/activity/ActivityManager.java b/server/sonar-server/src/main/java/org/sonar/server/computation/activity/ActivityManager.java index d3aa9de201e..3b73ce07bab 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/activity/ActivityManager.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/activity/ActivityManager.java @@ -20,10 +20,10 @@ package org.sonar.server.computation.activity; import javax.annotation.CheckForNull; -import org.sonar.core.component.ComponentDto; -import org.sonar.core.computation.db.AnalysisReportDto; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.MyBatis; +import org.sonar.db.component.ComponentDto; +import org.sonar.db.compute.AnalysisReportDto; +import org.sonar.db.DbSession; +import org.sonar.db.MyBatis; import org.sonar.server.activity.Activity; import org.sonar.server.activity.ActivityService; import org.sonar.server.db.DbClient; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/container/ComputeEngineContainerImpl.java b/server/sonar-server/src/main/java/org/sonar/server/computation/container/ComputeEngineContainerImpl.java index 00b8cab25a9..bf03be56377 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/container/ComputeEngineContainerImpl.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/container/ComputeEngineContainerImpl.java @@ -29,8 +29,8 @@ import org.picocontainer.lifecycle.ReflectionLifecycleStrategy; import org.picocontainer.monitors.NullComponentMonitor; import org.sonar.api.utils.log.Loggers; import org.sonar.api.utils.log.Profiler; -import org.sonar.core.component.Module; -import org.sonar.core.issue.db.UpdateConflictResolver; +import org.sonar.core.platform.Module; +import org.sonar.server.computation.issue.UpdateConflictResolver; import org.sonar.core.issue.tracking.Tracker; import org.sonar.core.platform.ComponentContainer; import org.sonar.server.computation.ComputationService; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/db/AnalysisReportDao.java b/server/sonar-server/src/main/java/org/sonar/server/computation/db/AnalysisReportDao.java index 115364cb4f4..6bb723732c6 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/db/AnalysisReportDao.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/db/AnalysisReportDao.java @@ -22,19 +22,19 @@ package org.sonar.server.computation.db; import com.google.common.annotations.VisibleForTesting; import org.sonar.api.utils.System2; -import org.sonar.core.computation.db.AnalysisReportDto; -import org.sonar.core.computation.db.AnalysisReportMapper; -import org.sonar.core.persistence.DaoComponent; -import org.sonar.core.persistence.DbSession; +import org.sonar.db.compute.AnalysisReportDto; +import org.sonar.db.compute.AnalysisReportMapper; +import org.sonar.db.Dao; +import org.sonar.db.DbSession; import javax.annotation.CheckForNull; import java.util.List; -import static org.sonar.core.computation.db.AnalysisReportDto.Status.PENDING; -import static org.sonar.core.computation.db.AnalysisReportDto.Status.WORKING; +import static org.sonar.db.compute.AnalysisReportDto.Status.PENDING; +import static org.sonar.db.compute.AnalysisReportDto.Status.WORKING; -public class AnalysisReportDao implements DaoComponent { +public class AnalysisReportDao implements Dao { private System2 system2; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/BaseIssuesLoader.java b/server/sonar-server/src/main/java/org/sonar/server/computation/issue/BaseIssuesLoader.java index 8ebfb64479e..3aea9995878 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/BaseIssuesLoader.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/issue/BaseIssuesLoader.java @@ -29,10 +29,10 @@ import org.apache.ibatis.session.ResultHandler; import org.sonar.api.rule.RuleKey; import org.sonar.api.rule.RuleStatus; import org.sonar.core.issue.DefaultIssue; -import org.sonar.core.issue.db.IssueDto; -import org.sonar.core.issue.db.IssueMapper; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.MyBatis; +import org.sonar.db.issue.IssueDto; +import org.sonar.db.issue.IssueMapper; +import org.sonar.db.DbSession; +import org.sonar.db.MyBatis; import org.sonar.server.computation.batch.BatchReportReader; import org.sonar.server.computation.component.TreeRootHolder; import org.sonar.server.db.DbClient; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/NewDebtAggregator.java b/server/sonar-server/src/main/java/org/sonar/server/computation/issue/NewDebtAggregator.java index c1d48f631b7..6f0fef0c988 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/NewDebtAggregator.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/issue/NewDebtAggregator.java @@ -27,7 +27,7 @@ import java.util.List; import java.util.Map; import org.sonar.api.measures.CoreMetrics; import org.sonar.core.issue.DefaultIssue; -import org.sonar.core.issue.db.IssueChangeDto; +import org.sonar.db.issue.IssueChangeDto; import org.sonar.server.computation.component.Component; import org.sonar.server.computation.measure.Measure; import org.sonar.server.computation.measure.MeasureRepository; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/NewDebtCalculator.java b/server/sonar-server/src/main/java/org/sonar/server/computation/issue/NewDebtCalculator.java index ed7502e7b22..d67bc99e04e 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/NewDebtCalculator.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/issue/NewDebtCalculator.java @@ -37,7 +37,7 @@ import org.apache.commons.lang.time.DateUtils; import org.sonar.core.issue.DefaultIssue; import org.sonar.core.issue.FieldDiffs; import org.sonar.core.issue.IssueUpdater; -import org.sonar.core.issue.db.IssueChangeDto; +import org.sonar.db.issue.IssueChangeDto; import org.sonar.server.computation.period.Period; import static com.google.common.collect.FluentIterable.from; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/RuleCacheLoader.java b/server/sonar-server/src/main/java/org/sonar/server/computation/issue/RuleCacheLoader.java index f655769e55d..2bdf37e462b 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/RuleCacheLoader.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/issue/RuleCacheLoader.java @@ -23,9 +23,9 @@ import java.util.Collection; import java.util.Map; import java.util.Set; import org.sonar.api.rule.RuleKey; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.MyBatis; -import org.sonar.core.rule.RuleDto; +import org.sonar.db.DbSession; +import org.sonar.db.MyBatis; +import org.sonar.db.rule.RuleDto; import org.sonar.server.computation.batch.BatchReportReader; import org.sonar.server.db.DbClient; import org.sonar.server.util.cache.CacheLoader; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/RuleImpl.java b/server/sonar-server/src/main/java/org/sonar/server/computation/issue/RuleImpl.java index 07548d5148f..a0f230ad7db 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/RuleImpl.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/issue/RuleImpl.java @@ -28,7 +28,7 @@ import org.sonar.api.rule.RuleKey; import org.sonar.api.rule.RuleStatus; import org.sonar.api.server.debt.DebtRemediationFunction; import org.sonar.api.server.debt.internal.DefaultDebtRemediationFunction; -import org.sonar.core.rule.RuleDto; +import org.sonar.db.rule.RuleDto; import static com.google.common.collect.Sets.union; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/TrackerBaseInputFactory.java b/server/sonar-server/src/main/java/org/sonar/server/computation/issue/TrackerBaseInputFactory.java index cf7da885f81..d9b7438b240 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/TrackerBaseInputFactory.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/issue/TrackerBaseInputFactory.java @@ -26,8 +26,8 @@ import org.sonar.core.issue.DefaultIssue; import org.sonar.core.issue.tracking.Input; import org.sonar.core.issue.tracking.LazyInput; import org.sonar.core.issue.tracking.LineHashSequence; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.MyBatis; +import org.sonar.db.DbSession; +import org.sonar.db.MyBatis; import org.sonar.server.computation.component.Component; import org.sonar.server.db.DbClient; diff --git a/sonar-core/src/main/java/org/sonar/core/issue/db/UpdateConflictResolver.java b/server/sonar-server/src/main/java/org/sonar/server/computation/issue/UpdateConflictResolver.java similarity index 96% rename from sonar-core/src/main/java/org/sonar/core/issue/db/UpdateConflictResolver.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/issue/UpdateConflictResolver.java index ccc84139154..15e71c8c01d 100644 --- a/sonar-core/src/main/java/org/sonar/core/issue/db/UpdateConflictResolver.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/issue/UpdateConflictResolver.java @@ -17,18 +17,18 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.issue.db; +package org.sonar.server.computation.issue; import com.google.common.annotations.VisibleForTesting; import org.sonar.api.utils.log.Logger; import org.sonar.api.utils.log.Loggers; import org.sonar.core.issue.DefaultIssue; +import org.sonar.db.issue.IssueDto; +import org.sonar.db.issue.IssueMapper; /** * Support concurrent modifications on issues made by analysis and users at the same time * See https://jira.sonarsource.com/browse/SONAR-4309 - * - * TODO move to compute engine */ public class UpdateConflictResolver { diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/MeasureDtoToMeasure.java b/server/sonar-server/src/main/java/org/sonar/server/computation/measure/MeasureDtoToMeasure.java index 5e031e7961c..b09d14430b4 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/MeasureDtoToMeasure.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/measure/MeasureDtoToMeasure.java @@ -21,7 +21,7 @@ package org.sonar.server.computation.measure; import com.google.common.base.Optional; import javax.annotation.Nullable; -import org.sonar.core.measure.db.MeasureDto; +import org.sonar.db.measure.MeasureDto; import org.sonar.server.computation.metric.Metric; import static com.google.common.base.Optional.of; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/MeasureKey.java b/server/sonar-server/src/main/java/org/sonar/server/computation/measure/MeasureKey.java index 2d2e32bc0f5..cba31316bfa 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/MeasureKey.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/measure/MeasureKey.java @@ -23,7 +23,7 @@ package org.sonar.server.computation.measure; import java.util.Objects; import javax.annotation.Nullable; import javax.annotation.concurrent.Immutable; -import org.sonar.core.rule.RuleDto; +import org.sonar.db.rule.RuleDto; import org.sonar.server.computation.debt.Characteristic; import static com.google.common.base.Preconditions.checkArgument; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/MeasureRepository.java b/server/sonar-server/src/main/java/org/sonar/server/computation/measure/MeasureRepository.java index f20322aea01..d9c3b32a15e 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/MeasureRepository.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/measure/MeasureRepository.java @@ -21,7 +21,7 @@ package org.sonar.server.computation.measure; import com.google.common.base.Optional; import com.google.common.collect.SetMultimap; -import org.sonar.core.rule.RuleDto; +import org.sonar.db.rule.RuleDto; import org.sonar.server.computation.component.Component; import org.sonar.server.computation.debt.Characteristic; import org.sonar.server.computation.metric.Metric; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/MeasureRepositoryImpl.java b/server/sonar-server/src/main/java/org/sonar/server/computation/measure/MeasureRepositoryImpl.java index 23ef25f129b..6bc789371e6 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/MeasureRepositoryImpl.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/measure/MeasureRepositoryImpl.java @@ -28,9 +28,9 @@ import java.util.Map; import java.util.Set; import javax.annotation.Nullable; import org.sonar.batch.protocol.output.BatchReport; -import org.sonar.core.measure.db.MeasureDto; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.rule.RuleDto; +import org.sonar.db.measure.MeasureDto; +import org.sonar.db.DbSession; +import org.sonar.db.rule.RuleDto; import org.sonar.server.computation.batch.BatchReportReader; import org.sonar.server.computation.component.Component; import org.sonar.server.computation.debt.Characteristic; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/MeasureToMeasureDto.java b/server/sonar-server/src/main/java/org/sonar/server/computation/measure/MeasureToMeasureDto.java index c758805e7da..f3b17a86c73 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/MeasureToMeasureDto.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/measure/MeasureToMeasureDto.java @@ -21,7 +21,7 @@ package org.sonar.server.computation.measure; import javax.annotation.CheckForNull; import javax.annotation.Nonnull; -import org.sonar.core.measure.db.MeasureDto; +import org.sonar.db.measure.MeasureDto; import org.sonar.server.computation.metric.Metric; public enum MeasureToMeasureDto { diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/newcoverage/NewCoverageMetricKeysModule.java b/server/sonar-server/src/main/java/org/sonar/server/computation/measure/newcoverage/NewCoverageMetricKeysModule.java index 35014bb71ce..7861952c45a 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/newcoverage/NewCoverageMetricKeysModule.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/measure/newcoverage/NewCoverageMetricKeysModule.java @@ -19,7 +19,7 @@ */ package org.sonar.server.computation.measure.newcoverage; -import org.sonar.core.component.Module; +import org.sonar.core.platform.Module; public class NewCoverageMetricKeysModule extends Module { @Override diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/metric/MetricDtoToMetric.java b/server/sonar-server/src/main/java/org/sonar/server/computation/metric/MetricDtoToMetric.java index 44a24fe208f..cfce85a4047 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/metric/MetricDtoToMetric.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/metric/MetricDtoToMetric.java @@ -21,7 +21,7 @@ package org.sonar.server.computation.metric; import com.google.common.base.Function; import javax.annotation.Nonnull; -import org.sonar.core.metric.db.MetricDto; +import org.sonar.db.metric.MetricDto; enum MetricDtoToMetric implements Function { INSTANCE; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/metric/MetricRepositoryImpl.java b/server/sonar-server/src/main/java/org/sonar/server/computation/metric/MetricRepositoryImpl.java index f7cc13e88e8..a4dea6f9afb 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/metric/MetricRepositoryImpl.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/metric/MetricRepositoryImpl.java @@ -26,8 +26,8 @@ import java.util.Map; import javax.annotation.CheckForNull; import javax.annotation.Nonnull; import org.picocontainer.Startable; -import org.sonar.core.metric.db.MetricDto; -import org.sonar.core.persistence.DbSession; +import org.sonar.db.metric.MetricDto; +import org.sonar.db.DbSession; import org.sonar.server.db.DbClient; import static com.google.common.collect.FluentIterable.from; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/qualitygate/QualityGateServiceImpl.java b/server/sonar-server/src/main/java/org/sonar/server/computation/qualitygate/QualityGateServiceImpl.java index 98e8cf3d6cb..eb98f4ec04f 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/qualitygate/QualityGateServiceImpl.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/qualitygate/QualityGateServiceImpl.java @@ -22,10 +22,10 @@ package org.sonar.server.computation.qualitygate; import com.google.common.base.Function; import com.google.common.base.Optional; import javax.annotation.Nonnull; -import org.sonar.core.qualitygate.db.QualityGateConditionDao; -import org.sonar.core.qualitygate.db.QualityGateConditionDto; -import org.sonar.core.qualitygate.db.QualityGateDao; -import org.sonar.core.qualitygate.db.QualityGateDto; +import org.sonar.db.qualitygate.QualityGateConditionDao; +import org.sonar.db.qualitygate.QualityGateConditionDto; +import org.sonar.db.qualitygate.QualityGateDao; +import org.sonar.db.qualitygate.QualityGateDto; import org.sonar.server.computation.metric.Metric; import org.sonar.server.computation.metric.MetricRepository; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/qualityprofile/QPMeasureData.java b/server/sonar-server/src/main/java/org/sonar/server/computation/qualityprofile/QPMeasureData.java index 791e6f67272..2d01421fb5c 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/qualityprofile/QPMeasureData.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/qualityprofile/QPMeasureData.java @@ -33,7 +33,7 @@ import java.util.SortedSet; import javax.annotation.Nonnull; import javax.annotation.concurrent.Immutable; import org.sonar.api.utils.text.JsonWriter; -import org.sonar.core.UtcDateUtils; +import org.sonar.core.util.UtcDateUtils; /** * Represents the array of JSON objects stored in the value of the diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/ApplyPermissionsStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/ApplyPermissionsStep.java index 0b30dbf19e5..8e69c81b619 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/ApplyPermissionsStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/ApplyPermissionsStep.java @@ -21,9 +21,9 @@ package org.sonar.server.computation.step; import org.sonar.api.resources.Qualifiers; -import org.sonar.core.permission.PermissionFacade; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.MyBatis; +import org.sonar.db.permission.PermissionFacade; +import org.sonar.db.DbSession; +import org.sonar.db.MyBatis; import org.sonar.server.computation.component.DbIdsRepository; import org.sonar.server.computation.component.TreeRootHolder; import org.sonar.server.db.DbClient; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/CustomMeasuresCopyStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/CustomMeasuresCopyStep.java index f9a1f02201a..1a530decd6d 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/CustomMeasuresCopyStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/CustomMeasuresCopyStep.java @@ -22,9 +22,9 @@ package org.sonar.server.computation.step; import com.google.common.annotations.VisibleForTesting; import java.util.List; import org.apache.commons.lang.math.NumberUtils; -import org.sonar.core.measure.custom.db.CustomMeasureDto; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.MyBatis; +import org.sonar.db.measure.CustomMeasureDto; +import org.sonar.db.DbSession; +import org.sonar.db.MyBatis; import org.sonar.server.computation.component.Component; import org.sonar.server.computation.component.DepthTraversalTypeAwareVisitor; import org.sonar.server.computation.component.TreeRootHolder; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/FeedDebtModelStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/FeedDebtModelStep.java index 80e7899eb5e..602e45a1ae8 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/FeedDebtModelStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/FeedDebtModelStep.java @@ -27,8 +27,8 @@ import java.util.List; import java.util.Map; import javax.annotation.Nonnull; import javax.annotation.Nullable; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.technicaldebt.db.CharacteristicDto; +import org.sonar.db.DbSession; +import org.sonar.db.debt.CharacteristicDto; import org.sonar.server.computation.debt.Characteristic; import org.sonar.server.computation.debt.MutableDebtModelHolder; import org.sonar.server.db.DbClient; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/FeedPeriodsStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/FeedPeriodsStep.java index 34a8016022a..545cae5faaf 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/FeedPeriodsStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/FeedPeriodsStep.java @@ -35,10 +35,10 @@ import org.sonar.api.resources.Qualifiers; import org.sonar.api.utils.DateUtils; import org.sonar.api.utils.log.Logger; import org.sonar.api.utils.log.Loggers; -import org.sonar.core.component.ComponentDto; -import org.sonar.core.component.SnapshotDto; -import org.sonar.core.component.db.SnapshotQuery; -import org.sonar.core.persistence.DbSession; +import org.sonar.db.component.ComponentDto; +import org.sonar.db.component.SnapshotDto; +import org.sonar.db.component.SnapshotQuery; +import org.sonar.db.DbSession; import org.sonar.server.computation.batch.BatchReportReader; import org.sonar.server.computation.component.Component; import org.sonar.server.computation.component.TreeRootHolder; @@ -46,9 +46,9 @@ import org.sonar.server.computation.period.Period; import org.sonar.server.computation.period.PeriodsHolderImpl; import org.sonar.server.db.DbClient; -import static org.sonar.core.component.db.SnapshotQuery.SORT_FIELD.BY_DATE; -import static org.sonar.core.component.db.SnapshotQuery.SORT_ORDER.ASC; -import static org.sonar.core.component.db.SnapshotQuery.SORT_ORDER.DESC; +import static org.sonar.db.component.SnapshotQuery.SORT_FIELD.BY_DATE; +import static org.sonar.db.component.SnapshotQuery.SORT_ORDER.ASC; +import static org.sonar.db.component.SnapshotQuery.SORT_ORDER.DESC; /** * Populates the {@link org.sonar.server.computation.period.PeriodsHolder} diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/FillComponentsStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/FillComponentsStep.java index ed7bec5ff52..5a94f7317ec 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/FillComponentsStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/FillComponentsStep.java @@ -25,9 +25,9 @@ import java.util.List; import java.util.Map; import org.sonar.api.utils.internal.Uuids; import org.sonar.batch.protocol.output.BatchReport; -import org.sonar.core.component.ComponentDto; +import org.sonar.db.component.ComponentDto; import org.sonar.core.component.ComponentKeys; -import org.sonar.core.persistence.DbSession; +import org.sonar.db.DbSession; import org.sonar.server.computation.batch.BatchReportReader; import org.sonar.server.computation.component.Component; import org.sonar.server.computation.component.ComponentImpl; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/FillMeasuresWithVariationsStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/FillMeasuresWithVariationsStep.java index c41d928ac5d..8b9773b90b5 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/FillMeasuresWithVariationsStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/FillMeasuresWithVariationsStep.java @@ -31,8 +31,8 @@ import java.util.Set; import javax.annotation.CheckForNull; import javax.annotation.Nonnull; import javax.annotation.Nullable; -import org.sonar.core.measure.db.PastMeasureDto; -import org.sonar.core.persistence.DbSession; +import org.sonar.db.measure.PastMeasureDto; +import org.sonar.db.DbSession; import org.sonar.server.computation.component.Component; import org.sonar.server.computation.component.DepthTraversalTypeAwareVisitor; import org.sonar.server.computation.component.TreeRootHolder; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/IndexComponentsStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/IndexComponentsStep.java index 53285259121..90998d7a063 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/IndexComponentsStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/IndexComponentsStep.java @@ -20,7 +20,7 @@ package org.sonar.server.computation.step; -import org.sonar.core.resource.ResourceIndexerDao; +import org.sonar.db.component.ResourceIndexerDao; import org.sonar.server.computation.component.DbIdsRepository; import org.sonar.server.computation.component.TreeRootHolder; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistComponentsStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistComponentsStep.java index ae9f889698e..995e37b6fb3 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistComponentsStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistComponentsStep.java @@ -34,8 +34,8 @@ import org.sonar.api.resources.Qualifiers; import org.sonar.api.resources.Scopes; import org.sonar.api.utils.System2; import org.sonar.batch.protocol.output.BatchReport; -import org.sonar.core.component.ComponentDto; -import org.sonar.core.persistence.DbSession; +import org.sonar.db.component.ComponentDto; +import org.sonar.db.DbSession; import org.sonar.server.computation.batch.BatchReportReader; import org.sonar.server.computation.component.Component; import org.sonar.server.computation.component.DbIdsRepository; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistDuplicationsStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistDuplicationsStep.java index 7e069c2dc5f..67e2a0b39e7 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistDuplicationsStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistDuplicationsStep.java @@ -25,10 +25,10 @@ import org.apache.commons.lang.StringEscapeUtils; import org.sonar.api.measures.CoreMetrics; import org.sonar.batch.protocol.output.BatchReport; import org.sonar.batch.protocol.output.BatchReport.Range; -import org.sonar.core.measure.db.MeasureDto; -import org.sonar.core.metric.db.MetricDto; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.MyBatis; +import org.sonar.db.measure.MeasureDto; +import org.sonar.db.metric.MetricDto; +import org.sonar.db.DbSession; +import org.sonar.db.MyBatis; import org.sonar.server.computation.batch.BatchReportReader; import org.sonar.server.computation.component.Component; import org.sonar.server.computation.component.DbIdsRepository; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistEventsStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistEventsStep.java index 21192713691..ce318a5866b 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistEventsStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistEventsStep.java @@ -23,9 +23,9 @@ package org.sonar.server.computation.step; import com.google.common.base.Function; import javax.annotation.Nonnull; import org.sonar.api.utils.System2; -import org.sonar.core.event.EventDto; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.MyBatis; +import org.sonar.db.event.EventDto; +import org.sonar.db.DbSession; +import org.sonar.db.MyBatis; import org.sonar.server.computation.batch.BatchReportReader; import org.sonar.server.computation.component.Component; import org.sonar.server.computation.component.DbIdsRepository; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistFileSourcesStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistFileSourcesStep.java index 8ab4833ba68..922f19a2a18 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistFileSourcesStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistFileSourcesStep.java @@ -30,10 +30,10 @@ import org.apache.ibatis.session.ResultContext; import org.apache.ibatis.session.ResultHandler; import org.sonar.api.utils.System2; import org.sonar.batch.protocol.output.BatchReport; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.MyBatis; -import org.sonar.core.source.db.FileSourceDto; -import org.sonar.core.source.db.FileSourceDto.Type; +import org.sonar.db.DbSession; +import org.sonar.db.MyBatis; +import org.sonar.db.source.FileSourceDto; +import org.sonar.db.source.FileSourceDto.Type; import org.sonar.server.computation.batch.BatchReportReader; import org.sonar.server.computation.component.Component; import org.sonar.server.computation.component.DepthTraversalTypeAwareVisitor; @@ -91,7 +91,7 @@ public class PersistFileSourcesStep implements ComputationStep { @Override public void visitProject(Component project) { this.projectUuid = project.getUuid(); - session.select("org.sonar.core.source.db.FileSourceMapper.selectHashesForProject", ImmutableMap.of("projectUuid", projectUuid, "dataType", Type.SOURCE), + session.select("org.sonar.db.source.FileSourceMapper.selectHashesForProject", ImmutableMap.of("projectUuid", projectUuid, "dataType", Type.SOURCE), new ResultHandler() { @Override public void handleResult(ResultContext context) { diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistIssuesStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistIssuesStep.java index 6ffda565d47..ff2688091b7 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistIssuesStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistIssuesStep.java @@ -24,13 +24,13 @@ import org.sonar.api.utils.System2; import org.sonar.core.issue.DefaultIssue; import org.sonar.core.issue.DefaultIssueComment; import org.sonar.core.issue.FieldDiffs; -import org.sonar.core.issue.db.IssueChangeDto; -import org.sonar.core.issue.db.IssueChangeMapper; -import org.sonar.core.issue.db.IssueDto; -import org.sonar.core.issue.db.IssueMapper; -import org.sonar.core.issue.db.UpdateConflictResolver; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.MyBatis; +import org.sonar.db.issue.IssueChangeDto; +import org.sonar.db.issue.IssueChangeMapper; +import org.sonar.db.issue.IssueDto; +import org.sonar.db.issue.IssueMapper; +import org.sonar.server.computation.issue.UpdateConflictResolver; +import org.sonar.db.DbSession; +import org.sonar.db.MyBatis; import org.sonar.server.computation.issue.IssueCache; import org.sonar.server.computation.issue.RuleRepository; import org.sonar.server.db.DbClient; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistMeasuresStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistMeasuresStep.java index 5478f00a889..3fa2b54ec1b 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistMeasuresStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistMeasuresStep.java @@ -29,8 +29,8 @@ import java.util.List; import java.util.Map; import javax.annotation.Nonnull; import org.sonar.api.measures.CoreMetrics; -import org.sonar.core.measure.db.MeasureDto; -import org.sonar.core.persistence.DbSession; +import org.sonar.db.measure.MeasureDto; +import org.sonar.db.DbSession; import org.sonar.server.computation.component.Component; import org.sonar.server.computation.component.DbIdsRepository; import org.sonar.server.computation.component.DepthTraversalTypeAwareVisitor; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistNumberOfDaysSinceLastCommitStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistNumberOfDaysSinceLastCommitStep.java index da5a180b7fa..113de32a2a2 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistNumberOfDaysSinceLastCommitStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistNumberOfDaysSinceLastCommitStep.java @@ -26,9 +26,9 @@ import javax.annotation.Nullable; import org.sonar.api.measures.CoreMetrics; import org.sonar.api.utils.System2; import org.sonar.batch.protocol.output.BatchReport; -import org.sonar.core.measure.db.MeasureDto; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.MyBatis; +import org.sonar.db.measure.MeasureDto; +import org.sonar.db.DbSession; +import org.sonar.db.MyBatis; import org.sonar.server.computation.batch.BatchReportReader; import org.sonar.server.computation.component.Component; import org.sonar.server.computation.component.DbIdsRepository; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistProjectLinksStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistProjectLinksStep.java index 64d5eff98b6..c97fcf6a275 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistProjectLinksStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistProjectLinksStep.java @@ -31,9 +31,9 @@ import javax.annotation.Nullable; import org.sonar.api.i18n.I18n; import org.sonar.batch.protocol.Constants; import org.sonar.batch.protocol.output.BatchReport; -import org.sonar.core.component.ComponentLinkDto; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.MyBatis; +import org.sonar.db.component.ComponentLinkDto; +import org.sonar.db.DbSession; +import org.sonar.db.MyBatis; import org.sonar.server.computation.batch.BatchReportReader; import org.sonar.server.computation.component.Component; import org.sonar.server.computation.component.DepthTraversalTypeAwareVisitor; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistSnapshotsStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistSnapshotsStep.java index 20b3dc193a9..97d18113767 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistSnapshotsStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistSnapshotsStep.java @@ -24,8 +24,8 @@ import javax.annotation.Nullable; import org.sonar.api.resources.Qualifiers; import org.sonar.api.resources.Scopes; import org.sonar.api.utils.System2; -import org.sonar.core.component.SnapshotDto; -import org.sonar.core.persistence.DbSession; +import org.sonar.db.component.SnapshotDto; +import org.sonar.db.DbSession; import org.sonar.server.computation.batch.BatchReportReader; import org.sonar.server.computation.component.Component; import org.sonar.server.computation.component.DbIdsRepository; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistTestsStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistTestsStep.java index 1dc5187e90c..436e5ac8e38 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistTestsStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistTestsStep.java @@ -40,10 +40,10 @@ import org.sonar.api.utils.internal.Uuids; import org.sonar.api.utils.log.Logger; import org.sonar.api.utils.log.Loggers; import org.sonar.batch.protocol.output.BatchReport; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.MyBatis; -import org.sonar.core.source.db.FileSourceDto; -import org.sonar.core.source.db.FileSourceDto.Type; +import org.sonar.db.DbSession; +import org.sonar.db.MyBatis; +import org.sonar.db.source.FileSourceDto; +import org.sonar.db.source.FileSourceDto.Type; import org.sonar.server.computation.batch.BatchReportReader; import org.sonar.server.computation.component.Component; import org.sonar.server.computation.component.DepthTraversalTypeAwareVisitor; @@ -102,7 +102,7 @@ public class PersistTestsStep implements ComputationStep { this.existingFileSourcesByUuid = new HashMap<>(); this.projectUuid = treeRootHolder.getRoot().getUuid(); this.projectKey = treeRootHolder.getRoot().getKey(); - session.select("org.sonar.core.source.db.FileSourceMapper.selectHashesForProject", + session.select("org.sonar.db.source.FileSourceMapper.selectHashesForProject", ImmutableMap.of("projectUuid", treeRootHolder.getRoot().getUuid(), "dataType", Type.TEST), new ResultHandler() { @Override diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PurgeDatastoresStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PurgeDatastoresStep.java index 9dddd4cf078..e8cf0019ce5 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PurgeDatastoresStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PurgeDatastoresStep.java @@ -21,9 +21,9 @@ package org.sonar.server.computation.step; import org.sonar.core.computation.dbcleaner.ProjectCleaner; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.MyBatis; -import org.sonar.core.purge.IdUuidPair; +import org.sonar.db.DbSession; +import org.sonar.db.MyBatis; +import org.sonar.db.purge.IdUuidPair; import org.sonar.server.computation.component.Component; import org.sonar.server.computation.component.DbIdsRepository; import org.sonar.server.computation.component.ProjectSettingsRepository; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/QualityProfileEventsStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/QualityProfileEventsStep.java index 18447724fab..20982691441 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/QualityProfileEventsStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/QualityProfileEventsStep.java @@ -29,7 +29,7 @@ import org.apache.commons.lang.time.DateUtils; import org.sonar.api.measures.CoreMetrics; import org.sonar.api.resources.Language; import org.sonar.api.utils.KeyValueFormat; -import org.sonar.core.UtcDateUtils; +import org.sonar.core.util.UtcDateUtils; import org.sonar.server.computation.component.Component; import org.sonar.server.computation.component.DepthTraversalTypeAwareVisitor; import org.sonar.server.computation.component.TreeRootHolder; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/SwitchSnapshotStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/SwitchSnapshotStep.java index c575dc7a346..659577bb868 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/SwitchSnapshotStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/SwitchSnapshotStep.java @@ -21,9 +21,9 @@ package org.sonar.server.computation.step; import java.util.List; -import org.sonar.core.component.SnapshotDto; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.MyBatis; +import org.sonar.db.component.SnapshotDto; +import org.sonar.db.DbSession; +import org.sonar.db.MyBatis; import org.sonar.server.component.db.SnapshotDao; import org.sonar.server.computation.component.Component; import org.sonar.server.computation.component.DbIdsRepository; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/ValidateProjectStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/ValidateProjectStep.java index ba0fe77f159..0185e35631a 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/ValidateProjectStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/ValidateProjectStep.java @@ -34,10 +34,10 @@ import org.sonar.api.CoreProperties; import org.sonar.api.config.Settings; import org.sonar.api.utils.MessageException; import org.sonar.batch.protocol.output.BatchReport; -import org.sonar.core.component.ComponentDto; +import org.sonar.db.component.ComponentDto; import org.sonar.core.component.ComponentKeys; -import org.sonar.core.component.SnapshotDto; -import org.sonar.core.persistence.DbSession; +import org.sonar.db.component.SnapshotDto; +import org.sonar.db.DbSession; import org.sonar.server.component.db.ComponentDao; import org.sonar.server.computation.batch.BatchReportReader; import org.sonar.server.computation.component.Component; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/ws/IsQueueEmptyWs.java b/server/sonar-server/src/main/java/org/sonar/server/computation/ws/IsQueueEmptyWs.java index ab580c50a98..fb247eac52d 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/ws/IsQueueEmptyWs.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/ws/IsQueueEmptyWs.java @@ -25,7 +25,7 @@ import org.sonar.api.server.ws.Request; import org.sonar.api.server.ws.RequestHandler; import org.sonar.api.server.ws.Response; import org.sonar.api.server.ws.WebService; -import org.sonar.core.computation.db.AnalysisReportDto; +import org.sonar.db.compute.AnalysisReportDto; import org.sonar.server.computation.ReportQueue; import java.util.List; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/ws/QueueAction.java b/server/sonar-server/src/main/java/org/sonar/server/computation/ws/QueueAction.java index caab5d33bc8..1ea1a4845d6 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/ws/QueueAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/ws/QueueAction.java @@ -24,7 +24,7 @@ import org.sonar.api.server.ws.Request; import org.sonar.api.server.ws.Response; import org.sonar.api.server.ws.WebService; import org.sonar.api.utils.text.JsonWriter; -import org.sonar.core.computation.db.AnalysisReportDto; +import org.sonar.db.compute.AnalysisReportDto; import org.sonar.server.computation.ReportQueue; import java.util.List; diff --git a/server/sonar-server/src/main/java/org/sonar/server/dashboard/db/DashboardDao.java b/server/sonar-server/src/main/java/org/sonar/server/dashboard/db/DashboardDao.java index 127aeac10ce..760d27657e2 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/dashboard/db/DashboardDao.java +++ b/server/sonar-server/src/main/java/org/sonar/server/dashboard/db/DashboardDao.java @@ -21,12 +21,12 @@ package org.sonar.server.dashboard.db; import javax.annotation.CheckForNull; import javax.annotation.Nullable; -import org.sonar.core.dashboard.DashboardDto; -import org.sonar.core.dashboard.DashboardMapper; -import org.sonar.core.persistence.DaoComponent; -import org.sonar.core.persistence.DbSession; +import org.sonar.db.dashboard.DashboardDto; +import org.sonar.db.dashboard.DashboardMapper; +import org.sonar.db.Dao; +import org.sonar.db.DbSession; -public class DashboardDao implements DaoComponent { +public class DashboardDao implements Dao { @CheckForNull public DashboardDto getNullableByKey(DbSession session, Long key) { diff --git a/server/sonar-server/src/main/java/org/sonar/server/dashboard/db/WidgetDao.java b/server/sonar-server/src/main/java/org/sonar/server/dashboard/db/WidgetDao.java index 5bc77ce1fe3..b44bb15dd75 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/dashboard/db/WidgetDao.java +++ b/server/sonar-server/src/main/java/org/sonar/server/dashboard/db/WidgetDao.java @@ -20,13 +20,13 @@ package org.sonar.server.dashboard.db; import java.util.Collection; -import org.sonar.core.dashboard.WidgetDto; -import org.sonar.core.dashboard.WidgetMapper; -import org.sonar.core.persistence.DaoComponent; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.MyBatis; +import org.sonar.db.dashboard.WidgetDto; +import org.sonar.db.dashboard.WidgetMapper; +import org.sonar.db.Dao; +import org.sonar.db.DbSession; +import org.sonar.db.MyBatis; -public class WidgetDao implements DaoComponent { +public class WidgetDao implements Dao { private MyBatis myBatis; diff --git a/server/sonar-server/src/main/java/org/sonar/server/dashboard/db/WidgetPropertyDao.java b/server/sonar-server/src/main/java/org/sonar/server/dashboard/db/WidgetPropertyDao.java index 9ac498ebc24..5aad93e8aad 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/dashboard/db/WidgetPropertyDao.java +++ b/server/sonar-server/src/main/java/org/sonar/server/dashboard/db/WidgetPropertyDao.java @@ -23,14 +23,14 @@ import com.google.common.base.Function; import java.util.Arrays; import java.util.Collection; import java.util.List; -import org.sonar.core.dashboard.WidgetPropertyDto; -import org.sonar.core.dashboard.WidgetPropertyMapper; -import org.sonar.core.persistence.DaoComponent; -import org.sonar.core.persistence.DaoUtils; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.MyBatis; +import org.sonar.db.dashboard.WidgetPropertyDto; +import org.sonar.db.dashboard.WidgetPropertyMapper; +import org.sonar.db.Dao; +import org.sonar.db.DaoUtils; +import org.sonar.db.DbSession; +import org.sonar.db.MyBatis; -public class WidgetPropertyDao implements DaoComponent { +public class WidgetPropertyDao implements Dao { private final MyBatis myBatis; diff --git a/server/sonar-server/src/main/java/org/sonar/server/dashboard/template/GlobalDefaultDashboard.java b/server/sonar-server/src/main/java/org/sonar/server/dashboard/template/GlobalDefaultDashboard.java index 708b45e6f2c..cd167f79481 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/dashboard/template/GlobalDefaultDashboard.java +++ b/server/sonar-server/src/main/java/org/sonar/server/dashboard/template/GlobalDefaultDashboard.java @@ -22,8 +22,8 @@ package org.sonar.server.dashboard.template; import org.sonar.api.web.Dashboard; import org.sonar.api.web.DashboardLayout; import org.sonar.api.web.DashboardTemplate; -import org.sonar.core.measure.db.MeasureFilterDao; -import org.sonar.core.measure.db.MeasureFilterDto; +import org.sonar.db.measure.MeasureFilterDao; +import org.sonar.db.measure.MeasureFilterDto; import org.sonar.server.dashboard.widget.MeasureFilterAsTreemapWidget; import org.sonar.server.dashboard.widget.MeasureFilterListWidget; import org.sonar.server.dashboard.widget.WelcomeWidget; diff --git a/server/sonar-server/src/main/java/org/sonar/server/dashboard/template/ProjectIssuesDashboard.java b/server/sonar-server/src/main/java/org/sonar/server/dashboard/template/ProjectIssuesDashboard.java index 405098f7f72..7474844bb75 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/dashboard/template/ProjectIssuesDashboard.java +++ b/server/sonar-server/src/main/java/org/sonar/server/dashboard/template/ProjectIssuesDashboard.java @@ -23,8 +23,8 @@ import com.google.common.base.Preconditions; import org.sonar.api.web.Dashboard; import org.sonar.api.web.DashboardLayout; import org.sonar.api.web.DashboardTemplate; -import org.sonar.core.issue.db.IssueFilterDao; -import org.sonar.core.issue.db.IssueFilterDto; +import org.sonar.db.issue.IssueFilterDao; +import org.sonar.db.issue.IssueFilterDto; import org.sonar.server.dashboard.widget.ProjectIssueFilterWidget; /** diff --git a/server/sonar-server/src/main/java/org/sonar/server/dashboard/ws/ShowAction.java b/server/sonar-server/src/main/java/org/sonar/server/dashboard/ws/ShowAction.java index 49ed5a37786..fa9f711e580 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/dashboard/ws/ShowAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/dashboard/ws/ShowAction.java @@ -25,11 +25,11 @@ import org.sonar.api.server.ws.Request; import org.sonar.api.server.ws.Response; import org.sonar.api.server.ws.WebService; import org.sonar.api.utils.text.JsonWriter; -import org.sonar.core.dashboard.DashboardDto; -import org.sonar.core.dashboard.WidgetDto; -import org.sonar.core.dashboard.WidgetPropertyDto; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.user.UserDto; +import org.sonar.db.dashboard.DashboardDto; +import org.sonar.db.dashboard.WidgetDto; +import org.sonar.db.dashboard.WidgetPropertyDto; +import org.sonar.db.DbSession; +import org.sonar.db.user.UserDto; import org.sonar.server.db.DbClient; import org.sonar.server.exceptions.NotFoundException; import org.sonar.server.user.UserSession; diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/BaseDao.java b/server/sonar-server/src/main/java/org/sonar/server/db/BaseDao.java index 83b46ae6209..df21adcba65 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/db/BaseDao.java +++ b/server/sonar-server/src/main/java/org/sonar/server/db/BaseDao.java @@ -23,13 +23,22 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; +import java.io.Serializable; +import java.sql.Timestamp; +import java.util.Collection; +import java.util.Collections; +import java.util.Date; +import java.util.List; +import java.util.Map; +import javax.annotation.CheckForNull; +import javax.annotation.Nullable; import org.apache.ibatis.session.ResultContext; import org.sonar.api.utils.System2; import org.sonar.api.utils.log.Logger; import org.sonar.api.utils.log.Loggers; -import org.sonar.core.persistence.DaoComponent; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.Dto; +import org.sonar.db.Dao; +import org.sonar.db.DbSession; +import org.sonar.db.Dto; import org.sonar.server.exceptions.NotFoundException; import org.sonar.server.search.DbSynchronizationHandler; import org.sonar.server.search.IndexDefinition; @@ -40,17 +49,6 @@ import org.sonar.server.search.action.RefreshIndex; import org.sonar.server.search.action.UpsertDto; import org.sonar.server.search.action.UpsertNestedItem; -import javax.annotation.CheckForNull; -import javax.annotation.Nullable; - -import java.io.Serializable; -import java.sql.Timestamp; -import java.util.Collection; -import java.util.Collections; -import java.util.Date; -import java.util.List; -import java.util.Map; - import static com.google.common.collect.Lists.newArrayList; import static com.google.common.collect.Maps.newHashMap; @@ -122,7 +120,7 @@ import static com.google.common.collect.Maps.newHashMap; * @param Produced DTO class from this dao * @param DTO Key class */ -public abstract class BaseDao, KEY extends Serializable> implements Dao, DaoComponent { +public abstract class BaseDao, KEY extends Serializable> implements DeprecatedDao, Dao { private static final Logger LOGGER = Loggers.get(BaseDao.class); diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/DatabaseChecker.java b/server/sonar-server/src/main/java/org/sonar/server/db/DatabaseChecker.java index 209f9f48423..61659ffe74c 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/db/DatabaseChecker.java +++ b/server/sonar-server/src/main/java/org/sonar/server/db/DatabaseChecker.java @@ -26,9 +26,9 @@ import org.picocontainer.Startable; import org.sonar.api.server.ServerSide; import org.sonar.api.utils.MessageException; import org.sonar.api.utils.log.Loggers; -import org.sonar.core.persistence.Database; -import org.sonar.core.persistence.dialect.H2; -import org.sonar.core.persistence.dialect.Oracle; +import org.sonar.db.Database; +import org.sonar.db.dialect.H2; +import org.sonar.db.dialect.Oracle; import java.sql.Connection; import java.sql.SQLException; diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/DbClient.java b/server/sonar-server/src/main/java/org/sonar/server/db/DbClient.java index 481ca005b96..9ff76871231 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/db/DbClient.java +++ b/server/sonar-server/src/main/java/org/sonar/server/db/DbClient.java @@ -26,25 +26,25 @@ import java.sql.SQLException; import java.util.IdentityHashMap; import java.util.Map; import org.sonar.api.server.ServerSide; -import org.sonar.core.issue.db.ActionPlanDao; -import org.sonar.core.issue.db.IssueChangeDao; -import org.sonar.core.issue.db.IssueFilterDao; -import org.sonar.core.permission.PermissionTemplateDao; -import org.sonar.core.persistence.DaoComponent; -import org.sonar.core.persistence.Database; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.MyBatis; -import org.sonar.core.properties.PropertiesDao; -import org.sonar.core.purge.PurgeDao; -import org.sonar.core.qualitygate.db.QualityGateConditionDao; -import org.sonar.core.qualityprofile.db.QualityProfileDao; -import org.sonar.core.resource.ResourceDao; -import org.sonar.core.technicaldebt.db.CharacteristicDao; -import org.sonar.core.template.LoadedTemplateDao; -import org.sonar.core.user.AuthorDao; -import org.sonar.core.user.AuthorizationDao; -import org.sonar.core.user.GroupMembershipDao; -import org.sonar.core.user.RoleDao; +import org.sonar.db.issue.ActionPlanDao; +import org.sonar.db.issue.IssueChangeDao; +import org.sonar.db.issue.IssueFilterDao; +import org.sonar.db.permission.PermissionTemplateDao; +import org.sonar.db.Dao; +import org.sonar.db.Database; +import org.sonar.db.DbSession; +import org.sonar.db.MyBatis; +import org.sonar.db.property.PropertiesDao; +import org.sonar.db.purge.PurgeDao; +import org.sonar.db.qualitygate.QualityGateConditionDao; +import org.sonar.db.qualityprofile.QualityProfileDao; +import org.sonar.db.component.ResourceDao; +import org.sonar.db.debt.CharacteristicDao; +import org.sonar.db.loadedtemplate.LoadedTemplateDao; +import org.sonar.db.user.AuthorDao; +import org.sonar.db.user.AuthorizationDao; +import org.sonar.db.user.GroupMembershipDao; +import org.sonar.db.user.RoleDao; import org.sonar.server.activity.db.ActivityDao; import org.sonar.server.component.db.ComponentDao; import org.sonar.server.component.db.ComponentIndexDao; @@ -110,13 +110,13 @@ public class DbClient { private final CustomMeasureDao customMeasureDao; private final QualityGateConditionDao gateConditionDao; - public DbClient(Database db, MyBatis myBatis, DaoComponent... daoComponents) { + public DbClient(Database db, MyBatis myBatis, Dao... daos) { this.db = db; this.myBatis = myBatis; - Map map = new IdentityHashMap<>(); - for (DaoComponent daoComponent : daoComponents) { - map.put(daoComponent.getClass(), daoComponent); + Map map = new IdentityHashMap<>(); + for (Dao dao : daos) { + map.put(dao.getClass(), dao); } ruleDao = getDao(map, RuleDao.class); activeRuleDao = getDao(map, ActiveRuleDao.class); @@ -303,7 +303,7 @@ public class DbClient { return gateConditionDao; } - private K getDao(Map map, Class clazz) { + private K getDao(Map map, Class clazz) { return (K) map.get(clazz); } diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/Dao.java b/server/sonar-server/src/main/java/org/sonar/server/db/DeprecatedDao.java similarity index 92% rename from server/sonar-server/src/main/java/org/sonar/server/db/Dao.java rename to server/sonar-server/src/main/java/org/sonar/server/db/DeprecatedDao.java index ceeb48d882b..1a7aeca22ca 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/db/Dao.java +++ b/server/sonar-server/src/main/java/org/sonar/server/db/DeprecatedDao.java @@ -19,20 +19,16 @@ */ package org.sonar.server.db; -import org.sonar.api.server.ServerSide; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.Dto; - -import javax.annotation.CheckForNull; -import javax.annotation.Nullable; - import java.io.Serializable; import java.util.Collection; import java.util.Date; import java.util.Map; +import javax.annotation.CheckForNull; +import javax.annotation.Nullable; +import org.sonar.db.DbSession; +import org.sonar.db.Dto; -@ServerSide -public interface Dao, KEY extends Serializable> { +public interface DeprecatedDao, KEY extends Serializable> { /** * Get a DTO by its key. Return null if the key does not exist. diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/AddColumnsBuilder.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/AddColumnsBuilder.java index 4010c94067e..6a2127247e1 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/AddColumnsBuilder.java +++ b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/AddColumnsBuilder.java @@ -26,10 +26,10 @@ import java.util.List; import javax.annotation.CheckForNull; import javax.annotation.Nullable; -import org.sonar.core.persistence.dialect.Dialect; -import org.sonar.core.persistence.dialect.MsSql; -import org.sonar.core.persistence.dialect.Oracle; -import org.sonar.core.persistence.dialect.PostgreSql; +import org.sonar.db.dialect.Dialect; +import org.sonar.db.dialect.MsSql; +import org.sonar.db.dialect.Oracle; +import org.sonar.db.dialect.PostgreSql; import com.google.common.base.CharMatcher; import com.google.common.base.Preconditions; diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/BaseDataChange.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/BaseDataChange.java index 75012719c1e..1988ea4d3dc 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/BaseDataChange.java +++ b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/BaseDataChange.java @@ -23,7 +23,7 @@ import java.sql.Connection; import java.sql.SQLException; import org.apache.commons.dbutils.DbUtils; -import org.sonar.core.persistence.Database; +import org.sonar.db.Database; public abstract class BaseDataChange implements DataChange, MigrationStep { diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/DataChange.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/DataChange.java index e87582df33d..fa017afcd6d 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/DataChange.java +++ b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/DataChange.java @@ -22,7 +22,7 @@ package org.sonar.server.db.migrations; import java.sql.Connection; import java.sql.SQLException; -import org.sonar.core.persistence.Database; +import org.sonar.db.Database; public interface DataChange { diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/DatabaseMigrator.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/DatabaseMigrator.java index 7828afce580..f033cc4d55c 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/DatabaseMigrator.java +++ b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/DatabaseMigrator.java @@ -26,7 +26,7 @@ import org.picocontainer.Startable; import org.sonar.api.server.ServerSide; import org.sonar.api.platform.ServerUpgradeStatus; import org.sonar.api.utils.log.Loggers; -import org.sonar.core.persistence.DdlUtils; +import org.sonar.db.DdlUtils; import org.sonar.server.db.DbClient; import org.sonar.server.plugins.ServerPluginRepository; diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/DdlChange.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/DdlChange.java index 00320c1a3fe..626b9f6e369 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/DdlChange.java +++ b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/DdlChange.java @@ -23,7 +23,7 @@ import java.sql.Connection; import java.sql.SQLException; import org.apache.commons.dbutils.DbUtils; -import org.sonar.core.persistence.Database; +import org.sonar.db.Database; public abstract class DdlChange implements MigrationStep { diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/DropColumnsBuilder.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/DropColumnsBuilder.java index a0a2ee1d2c6..e0274003311 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/DropColumnsBuilder.java +++ b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/DropColumnsBuilder.java @@ -19,11 +19,11 @@ */ package org.sonar.server.db.migrations; -import org.sonar.core.persistence.dialect.Dialect; -import org.sonar.core.persistence.dialect.MsSql; -import org.sonar.core.persistence.dialect.MySql; -import org.sonar.core.persistence.dialect.Oracle; -import org.sonar.core.persistence.dialect.PostgreSql; +import org.sonar.db.dialect.Dialect; +import org.sonar.db.dialect.MsSql; +import org.sonar.db.dialect.MySql; +import org.sonar.db.dialect.Oracle; +import org.sonar.db.dialect.PostgreSql; public class DropColumnsBuilder { diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/MassUpdate.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/MassUpdate.java index f437ea5aff5..39793966f9e 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/MassUpdate.java +++ b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/MassUpdate.java @@ -22,7 +22,7 @@ package org.sonar.server.db.migrations; import java.sql.Connection; import java.sql.SQLException; import java.util.concurrent.atomic.AtomicLong; -import org.sonar.core.persistence.Database; +import org.sonar.db.Database; import org.sonar.server.util.ProgressLogger; public class MassUpdate { diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/MigrationStepModule.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/MigrationStepModule.java index 48a733082d5..52cb95becf5 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/MigrationStepModule.java +++ b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/MigrationStepModule.java @@ -19,7 +19,7 @@ */ package org.sonar.server.db.migrations; -import org.sonar.core.component.Module; +import org.sonar.core.platform.Module; import org.sonar.server.db.migrations.v36.ViolationMigrationStep; import org.sonar.server.db.migrations.v42.CompleteIssueMessageMigrationStep; import org.sonar.server.db.migrations.v42.PackageKeysMigrationStep; diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/SelectImpl.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/SelectImpl.java index 62ad570ded6..c03ba33c3f3 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/SelectImpl.java +++ b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/SelectImpl.java @@ -27,7 +27,7 @@ import java.util.ArrayList; import java.util.List; import org.apache.commons.dbutils.DbUtils; -import org.sonar.core.persistence.Database; +import org.sonar.db.Database; class SelectImpl extends BaseSqlStatement + SELECT r.resource_id FROM resource_index r diff --git a/sonar-core/src/main/resources/org/sonar/core/component/db/ComponentLinkMapper.xml b/sonar-db/src/main/resources/org/sonar/db/component/ComponentLinkMapper.xml similarity index 81% rename from sonar-core/src/main/resources/org/sonar/core/component/db/ComponentLinkMapper.xml rename to sonar-db/src/main/resources/org/sonar/db/component/ComponentLinkMapper.xml index 9d87b6078d7..c6db203313b 100644 --- a/sonar-core/src/main/resources/org/sonar/core/component/db/ComponentLinkMapper.xml +++ b/sonar-db/src/main/resources/org/sonar/db/component/ComponentLinkMapper.xml @@ -1,6 +1,6 @@ - + p.id, @@ -21,11 +21,13 @@ INSERT INTO project_links (component_uuid, link_type, name, href) - VALUES (#{componentUuid,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{href,jdbcType=VARCHAR}) + VALUES (#{componentUuid,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, + #{href,jdbcType=VARCHAR}) - UPDATE project_links SET component_uuid=#{componentUuid,jdbcType=VARCHAR}, link_type=#{type,jdbcType=VARCHAR}, name=#{name,jdbcType=VARCHAR}, href=#{href,jdbcType=VARCHAR} + UPDATE project_links SET component_uuid=#{componentUuid,jdbcType=VARCHAR}, link_type=#{type,jdbcType=VARCHAR}, + name=#{name,jdbcType=VARCHAR}, href=#{href,jdbcType=VARCHAR} WHERE id=#{id} diff --git a/sonar-core/src/main/resources/org/sonar/core/component/db/ComponentMapper.xml b/sonar-db/src/main/resources/org/sonar/db/component/ComponentMapper.xml similarity index 78% rename from sonar-core/src/main/resources/org/sonar/core/component/db/ComponentMapper.xml rename to sonar-db/src/main/resources/org/sonar/db/component/ComponentMapper.xml index 8c58c026256..19740c7f76e 100644 --- a/sonar-core/src/main/resources/org/sonar/core/component/db/ComponentMapper.xml +++ b/sonar-db/src/main/resources/org/sonar/db/component/ComponentMapper.xml @@ -1,6 +1,6 @@ - + p.id, @@ -33,7 +33,8 @@ - INNER JOIN projects module ON module.project_uuid = p.project_uuid AND module.uuid = #{moduleUuid} AND module.scope='PRJ' AND module.enabled = ${_true} + INNER JOIN projects module ON module.project_uuid = p.project_uuid AND module.uuid = #{moduleUuid} AND + module.scope='PRJ' AND module.enabled = ${_true} p.enabled = ${_true} @@ -202,7 +210,8 @@ @@ -241,7 +251,8 @@ @@ -268,32 +279,36 @@ - INSERT INTO projects (kee, deprecated_kee, uuid, project_uuid, module_uuid, module_uuid_path, name, long_name, qualifier, scope, language, description, root_id, path, copy_resource_id, enabled, + INSERT INTO projects (kee, deprecated_kee, uuid, project_uuid, module_uuid, module_uuid_path, name, long_name, + qualifier, scope, language, description, root_id, path, copy_resource_id, enabled, created_at, authorization_updated_at) - VALUES (#{kee,jdbcType=VARCHAR}, #{deprecatedKey,jdbcType=VARCHAR}, #{uuid,jdbcType=VARCHAR}, #{projectUuid,jdbcType=VARCHAR}, #{moduleUuid,jdbcType=VARCHAR}, #{moduleUuidPath,jdbcType=VARCHAR}, - #{name,jdbcType=VARCHAR}, #{longName,jdbcType=VARCHAR}, #{qualifier,jdbcType=VARCHAR}, #{scope,jdbcType=VARCHAR}, #{language,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}, - #{parentProjectId,jdbcType=BIGINT}, #{path,jdbcType=VARCHAR}, #{copyResourceId,jdbcType=BIGINT}, #{enabled,jdbcType=BOOLEAN}, - #{createdAt,jdbcType=TIMESTAMP}, #{authorizationUpdatedAt,jdbcType=BIGINT}) + VALUES (#{kee,jdbcType=VARCHAR}, #{deprecatedKey,jdbcType=VARCHAR}, #{uuid,jdbcType=VARCHAR}, + #{projectUuid,jdbcType=VARCHAR}, #{moduleUuid,jdbcType=VARCHAR}, #{moduleUuidPath,jdbcType=VARCHAR}, + #{name,jdbcType=VARCHAR}, #{longName,jdbcType=VARCHAR}, #{qualifier,jdbcType=VARCHAR}, #{scope,jdbcType=VARCHAR}, + #{language,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}, + #{parentProjectId,jdbcType=BIGINT}, #{path,jdbcType=VARCHAR}, #{copyResourceId,jdbcType=BIGINT}, + #{enabled,jdbcType=BOOLEAN}, + #{createdAt,jdbcType=TIMESTAMP}, #{authorizationUpdatedAt,jdbcType=BIGINT}) UPDATE projects SET - kee=#{kee,jdbcType=VARCHAR}, - deprecated_kee=#{deprecatedKey,jdbcType=VARCHAR}, - project_uuid=#{projectUuid,jdbcType=VARCHAR}, - module_uuid=#{moduleUuid,jdbcType=VARCHAR}, - module_uuid_path=#{moduleUuidPath,jdbcType=VARCHAR}, - name=#{name,jdbcType=VARCHAR}, - long_name=#{longName,jdbcType=VARCHAR}, - qualifier=#{qualifier,jdbcType=VARCHAR}, - scope=#{scope,jdbcType=VARCHAR}, - language=#{language,jdbcType=VARCHAR}, - description=#{description,jdbcType=VARCHAR}, - root_id=#{parentProjectId,jdbcType=BIGINT}, - path=#{path,jdbcType=VARCHAR}, - copy_resource_id=#{copyResourceId,jdbcType=BIGINT}, - enabled=#{enabled,jdbcType=BOOLEAN}, - authorization_updated_at=#{authorizationUpdatedAt,jdbcType=BIGINT} + kee=#{kee,jdbcType=VARCHAR}, + deprecated_kee=#{deprecatedKey,jdbcType=VARCHAR}, + project_uuid=#{projectUuid,jdbcType=VARCHAR}, + module_uuid=#{moduleUuid,jdbcType=VARCHAR}, + module_uuid_path=#{moduleUuidPath,jdbcType=VARCHAR}, + name=#{name,jdbcType=VARCHAR}, + long_name=#{longName,jdbcType=VARCHAR}, + qualifier=#{qualifier,jdbcType=VARCHAR}, + scope=#{scope,jdbcType=VARCHAR}, + language=#{language,jdbcType=VARCHAR}, + description=#{description,jdbcType=VARCHAR}, + root_id=#{parentProjectId,jdbcType=BIGINT}, + path=#{path,jdbcType=VARCHAR}, + copy_resource_id=#{copyResourceId,jdbcType=BIGINT}, + enabled=#{enabled,jdbcType=BOOLEAN}, + authorization_updated_at=#{authorizationUpdatedAt,jdbcType=BIGINT} WHERE uuid=#{uuid} diff --git a/sonar-core/src/main/resources/org/sonar/core/resource/ResourceIndexerMapper.xml b/sonar-db/src/main/resources/org/sonar/db/component/ResourceIndexerMapper.xml similarity index 97% rename from sonar-core/src/main/resources/org/sonar/core/resource/ResourceIndexerMapper.xml rename to sonar-db/src/main/resources/org/sonar/db/component/ResourceIndexerMapper.xml index 91c494daa4a..82afc7fa85d 100644 --- a/sonar-core/src/main/resources/org/sonar/core/resource/ResourceIndexerMapper.xml +++ b/sonar-db/src/main/resources/org/sonar/db/component/ResourceIndexerMapper.xml @@ -1,7 +1,7 @@ - + ar.id, @@ -19,7 +19,8 @@ insert into analysis_reports (project_key, project_name, uuid, report_status, created_at, updated_at, started_at, finished_at) values ( - #{projectKey,jdbcType=VARCHAR}, #{projectName,jdbcType=VARCHAR}, #{uuid,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, + #{projectKey,jdbcType=VARCHAR}, #{projectName,jdbcType=VARCHAR}, #{uuid,jdbcType=VARCHAR}, + #{status,jdbcType=VARCHAR}, #{createdAt,jdbcType=BIGINT}, #{updatedAt,jdbcType=BIGINT}, #{startedAt,jdbcType=BIGINT}, #{finishedAt,jdbcType=BIGINT} ) diff --git a/sonar-core/src/main/resources/org/sonar/core/dashboard/ActiveDashboardMapper.xml b/sonar-db/src/main/resources/org/sonar/db/dashboard/ActiveDashboardMapper.xml similarity index 82% rename from sonar-core/src/main/resources/org/sonar/core/dashboard/ActiveDashboardMapper.xml rename to sonar-db/src/main/resources/org/sonar/db/dashboard/ActiveDashboardMapper.xml index a192aab847f..6c88317e890 100644 --- a/sonar-core/src/main/resources/org/sonar/core/dashboard/ActiveDashboardMapper.xml +++ b/sonar-db/src/main/resources/org/sonar/db/dashboard/ActiveDashboardMapper.xml @@ -1,14 +1,14 @@ - + - + INSERT INTO active_dashboards (dashboard_id, user_id, order_index) VALUES (#{dashboardId}, #{userId}, #{orderIndex}) - SELECT MAX(order_index) FROM active_dashboards WHERE user_id IS NULL @@ -20,34 +20,36 @@ - select from widgets w where w.id=#{id} + select + + from widgets w where w.id=#{id} diff --git a/sonar-core/src/main/resources/org/sonar/core/dashboard/WidgetPropertyMapper.xml b/sonar-db/src/main/resources/org/sonar/db/dashboard/WidgetPropertyMapper.xml similarity index 72% rename from sonar-core/src/main/resources/org/sonar/core/dashboard/WidgetPropertyMapper.xml rename to sonar-db/src/main/resources/org/sonar/db/dashboard/WidgetPropertyMapper.xml index e4744f93075..a2bf8024a7f 100644 --- a/sonar-core/src/main/resources/org/sonar/core/dashboard/WidgetPropertyMapper.xml +++ b/sonar-db/src/main/resources/org/sonar/db/dashboard/WidgetPropertyMapper.xml @@ -1,11 +1,11 @@ - + - DELETE FROM widget_properties - WHERE widget_id IN + DELETE FROM widget_properties + WHERE widget_id IN #{wid} diff --git a/sonar-core/src/main/resources/org/sonar/core/technicaldebt/db/CharacteristicMapper.xml b/sonar-db/src/main/resources/org/sonar/db/debt/CharacteristicMapper.xml similarity index 80% rename from sonar-core/src/main/resources/org/sonar/core/technicaldebt/db/CharacteristicMapper.xml rename to sonar-db/src/main/resources/org/sonar/db/debt/CharacteristicMapper.xml index 123d7054a3e..a5f7aa7848a 100644 --- a/sonar-core/src/main/resources/org/sonar/core/technicaldebt/db/CharacteristicMapper.xml +++ b/sonar-db/src/main/resources/org/sonar/db/debt/CharacteristicMapper.xml @@ -2,7 +2,7 @@ - + c.id, @@ -16,18 +16,21 @@ + - + DELETE FROM characteristics WHERE rule_id IS NOT NULL diff --git a/sonar-core/src/main/resources/org/sonar/core/duplication/DuplicationMapper.xml b/sonar-db/src/main/resources/org/sonar/db/duplication/DuplicationMapper.xml similarity index 84% rename from sonar-core/src/main/resources/org/sonar/core/duplication/DuplicationMapper.xml rename to sonar-db/src/main/resources/org/sonar/db/duplication/DuplicationMapper.xml index 530c1182ebf..66212b3b205 100644 --- a/sonar-core/src/main/resources/org/sonar/core/duplication/DuplicationMapper.xml +++ b/sonar-db/src/main/resources/org/sonar/db/duplication/DuplicationMapper.xml @@ -1,10 +1,11 @@ - + - + INSERT INTO duplications_index (snapshot_id, project_snapshot_id, hash, index_in_file, start_line, end_line) VALUES (#{snapshotId}, #{projectSnapshotId}, #{hash}, #{indexInFile}, #{startLine}, #{endLine}) diff --git a/sonar-core/src/main/resources/org/sonar/core/event/db/EventMapper.xml b/sonar-db/src/main/resources/org/sonar/db/event/EventMapper.xml similarity index 83% rename from sonar-core/src/main/resources/org/sonar/core/event/db/EventMapper.xml rename to sonar-db/src/main/resources/org/sonar/db/event/EventMapper.xml index 0c6dc2d3eb7..fa30a1f766f 100644 --- a/sonar-core/src/main/resources/org/sonar/core/event/db/EventMapper.xml +++ b/sonar-db/src/main/resources/org/sonar/db/event/EventMapper.xml @@ -1,6 +1,6 @@ - + e.id, @@ -15,7 +15,8 @@ SELECT s.id FROM snapshots s, events e, projects p @@ -44,7 +45,7 @@ ORDER BY e.event_date DESC LIMIT 1 - + SELECT * FROM (SELECT s.id - FROM snapshots s, events e, projects p - - AND p.id=#{componentId} - AND p.uuid=e.component_uuid - AND e.name <> #{currentVersion} - AND e.category='Version' - AND s.id = e.snapshot_id - - ORDER BY e.event_date DESC + FROM snapshots s, events e, projects p + + AND p.id=#{componentId} + AND p.uuid=e.component_uuid + AND e.name <> #{currentVersion} + AND e.category='Version' + AND s.id = e.snapshot_id + + ORDER BY e.event_date DESC ) WHERE ROWNUM <= 1 diff --git a/sonar-core/src/main/resources/org/sonar/core/issue/db/ActionPlanMapper.xml b/sonar-db/src/main/resources/org/sonar/db/issue/ActionPlanMapper.xml similarity index 85% rename from sonar-core/src/main/resources/org/sonar/core/issue/db/ActionPlanMapper.xml rename to sonar-db/src/main/resources/org/sonar/db/issue/ActionPlanMapper.xml index 1d770735304..49174ddad74 100644 --- a/sonar-core/src/main/resources/org/sonar/core/issue/db/ActionPlanMapper.xml +++ b/sonar-db/src/main/resources/org/sonar/db/issue/ActionPlanMapper.xml @@ -2,7 +2,7 @@ - + ap.id, @@ -18,9 +18,10 @@ p.kee as projectKey - + INSERT INTO action_plans (kee, name, description, user_login, project_id, status, deadline, created_at, updated_at) - VALUES (#{kee}, #{name}, #{description}, #{userLogin}, #{projectId}, #{status}, #{deadLine}, #{createdAt}, #{updatedAt}) + VALUES (#{kee}, #{name}, #{description}, #{userLogin}, #{projectId}, #{status}, #{deadLine}, #{createdAt}, + #{updatedAt}) @@ -40,7 +41,8 @@ - select , count(total_issues.id) as totalIssues, count(open_issues.id) as unresolvedIssues + select, count(total_issues.id) as totalIssues, count(open_issues.id) as + unresolvedIssues from action_plans ap left join projects p on p.id = ap.project_id left join issues total_issues on total_issues.action_plan_key = ap.kee @@ -27,7 +28,8 @@ and ap.project_id = #{projectId} - group by ap.id, ap.kee, ap.name, ap.description, ap.user_login, ap.project_id, ap.status, ap.deadline, ap.created_at, ap.updated_at, p.kee + group by ap.id, ap.kee, ap.name, ap.description, ap.user_login, ap.project_id, ap.status, ap.deadline, + ap.created_at, ap.updated_at, p.kee - \ No newline at end of file + diff --git a/sonar-core/src/main/resources/org/sonar/core/issue/db/IssueChangeMapper.xml b/sonar-db/src/main/resources/org/sonar/db/issue/IssueChangeMapper.xml similarity index 97% rename from sonar-core/src/main/resources/org/sonar/core/issue/db/IssueChangeMapper.xml rename to sonar-db/src/main/resources/org/sonar/db/issue/IssueChangeMapper.xml index b4aa445dae3..96caa141092 100644 --- a/sonar-core/src/main/resources/org/sonar/core/issue/db/IssueChangeMapper.xml +++ b/sonar-db/src/main/resources/org/sonar/db/issue/IssueChangeMapper.xml @@ -2,7 +2,7 @@ - + c.id, diff --git a/sonar-core/src/main/resources/org/sonar/core/issue/db/IssueFilterFavouriteMapper.xml b/sonar-db/src/main/resources/org/sonar/db/issue/IssueFilterFavouriteMapper.xml similarity index 80% rename from sonar-core/src/main/resources/org/sonar/core/issue/db/IssueFilterFavouriteMapper.xml rename to sonar-db/src/main/resources/org/sonar/db/issue/IssueFilterFavouriteMapper.xml index 8f6ca9fef93..77db11f635c 100644 --- a/sonar-core/src/main/resources/org/sonar/core/issue/db/IssueFilterFavouriteMapper.xml +++ b/sonar-db/src/main/resources/org/sonar/db/issue/IssueFilterFavouriteMapper.xml @@ -2,7 +2,7 @@ - + filter_favourites.id as id, @@ -12,13 +12,15 @@ @@ -28,11 +30,11 @@ VALUES (#{userLogin}, #{issueFilterId}, current_timestamp) - + delete from issue_filter_favourites where id=#{id} - + delete from issue_filter_favourites where issue_filter_id=#{issueFilterId} diff --git a/sonar-core/src/main/resources/org/sonar/core/issue/db/IssueFilterMapper.xml b/sonar-db/src/main/resources/org/sonar/db/issue/IssueFilterMapper.xml similarity index 78% rename from sonar-core/src/main/resources/org/sonar/core/issue/db/IssueFilterMapper.xml rename to sonar-db/src/main/resources/org/sonar/db/issue/IssueFilterMapper.xml index 75e324a9e6e..aca8dffc6c2 100644 --- a/sonar-core/src/main/resources/org/sonar/core/issue/db/IssueFilterMapper.xml +++ b/sonar-db/src/main/resources/org/sonar/db/issue/IssueFilterMapper.xml @@ -2,7 +2,7 @@ - + filters.id as id, @@ -16,44 +16,49 @@ - + INSERT INTO issue_filters (name, user_login, shared, description, data, created_at, updated_at) VALUES (#{name}, #{userLogin}, #{shared}, #{description}, #{data}, #{createdAt}, #{updatedAt}) - + update issue_filters set name=#{name}, shared=#{shared}, @@ -64,7 +69,7 @@ where id=#{id} - + delete from issue_filters where id=#{id} diff --git a/sonar-core/src/main/resources/org/sonar/core/issue/db/IssueMapper.xml b/sonar-db/src/main/resources/org/sonar/db/issue/IssueMapper.xml similarity index 98% rename from sonar-core/src/main/resources/org/sonar/core/issue/db/IssueMapper.xml rename to sonar-db/src/main/resources/org/sonar/db/issue/IssueMapper.xml index a6511b06329..790040bc6e3 100644 --- a/sonar-core/src/main/resources/org/sonar/core/issue/db/IssueMapper.xml +++ b/sonar-db/src/main/resources/org/sonar/db/issue/IssueMapper.xml @@ -2,7 +2,7 @@ - + i.id, @@ -192,7 +192,8 @@ p.kee as componentKey, root.kee as projectKey from issues i - inner join (select p.id, p.uuid,p.kee from projects p where (p.root_id=#{id} and p.qualifier <> 'BRC') or (p.id=#{id})) p on p.uuid=i.component_uuid + inner join (select p.id, p.uuid,p.kee from projects p where (p.root_id=#{id} and p.qualifier <> 'BRC') or + (p.id=#{id})) p on p.uuid=i.component_uuid inner join rules r on r.id=i.rule_id left outer join projects root on root.uuid=i.project_uuid where i.status <> 'CLOSED' diff --git a/sonar-core/src/main/resources/org/sonar/core/template/LoadedTemplateMapper.xml b/sonar-db/src/main/resources/org/sonar/db/loadedtemplate/LoadedTemplateMapper.xml similarity index 92% rename from sonar-core/src/main/resources/org/sonar/core/template/LoadedTemplateMapper.xml rename to sonar-db/src/main/resources/org/sonar/db/loadedtemplate/LoadedTemplateMapper.xml index 5e0f57f200d..0395aad517a 100644 --- a/sonar-core/src/main/resources/org/sonar/core/template/LoadedTemplateMapper.xml +++ b/sonar-db/src/main/resources/org/sonar/db/loadedtemplate/LoadedTemplateMapper.xml @@ -1,7 +1,7 @@ - + diff --git a/sonar-core/src/main/resources/org/sonar/core/measure/custom/db/CustomMeasureMapper.xml b/sonar-db/src/main/resources/org/sonar/db/measure/CustomMeasureMapper.xml similarity index 97% rename from sonar-core/src/main/resources/org/sonar/core/measure/custom/db/CustomMeasureMapper.xml rename to sonar-db/src/main/resources/org/sonar/db/measure/CustomMeasureMapper.xml index 8d39aac0143..119cec178b4 100644 --- a/sonar-core/src/main/resources/org/sonar/core/measure/custom/db/CustomMeasureMapper.xml +++ b/sonar-db/src/main/resources/org/sonar/db/measure/CustomMeasureMapper.xml @@ -1,7 +1,7 @@ - + m.id, m.metric_id as metricId, diff --git a/sonar-core/src/main/resources/org/sonar/core/measure/db/MeasureFilterMapper.xml b/sonar-db/src/main/resources/org/sonar/db/measure/MeasureFilterMapper.xml similarity index 76% rename from sonar-core/src/main/resources/org/sonar/core/measure/db/MeasureFilterMapper.xml rename to sonar-db/src/main/resources/org/sonar/db/measure/MeasureFilterMapper.xml index 0ed22491088..85e85b3fa4e 100644 --- a/sonar-core/src/main/resources/org/sonar/core/measure/db/MeasureFilterMapper.xml +++ b/sonar-db/src/main/resources/org/sonar/db/measure/MeasureFilterMapper.xml @@ -1,14 +1,15 @@ - + - + select id, name, user_id as "userId", shared, description, data, created_at as "createdAt", updated_at as + "updatedAt" from measure_filters WHERE user_id is null and name=#{id} - + INSERT INTO measure_filters (name, user_id, shared, description, data, created_at, updated_at) VALUES (#{name}, #{userId}, #{shared}, #{description}, #{data}, #{createdAt}, #{updatedAt}) diff --git a/sonar-core/src/main/resources/org/sonar/core/measure/db/MeasureMapper.xml b/sonar-db/src/main/resources/org/sonar/db/measure/MeasureMapper.xml similarity index 89% rename from sonar-core/src/main/resources/org/sonar/core/measure/db/MeasureMapper.xml rename to sonar-db/src/main/resources/org/sonar/db/measure/MeasureMapper.xml index 8c13c1d2472..7d83e993e05 100644 --- a/sonar-core/src/main/resources/org/sonar/core/measure/db/MeasureMapper.xml +++ b/sonar-db/src/main/resources/org/sonar/db/measure/MeasureMapper.xml @@ -1,7 +1,7 @@ - + pm.id, @@ -70,8 +70,10 @@ - + SELECT pm.id as id, pm.metric_id as metricId, pm.rule_id as ruleId, pm.characteristic_id as characteristicId, + pm.person_id as personId, pm.value as value FROM project_measures pm INNER JOIN snapshots s ON s.id=pm.snapshot_id AND s.status=#{status} INNER JOIN projects p ON p.id=s.project_id AND p.enabled=${_true} @@ -95,16 +97,17 @@ #{ruleId, jdbcType=INTEGER}, #{textValue, jdbcType=VARCHAR}, #{componentId, jdbcType=INTEGER}, #{alertStatus, jdbcType=VARCHAR}, #{alertText, jdbcType=VARCHAR}, #{description, jdbcType=VARCHAR}, #{characteristicId, jdbcType=INTEGER}, - #{personId, jdbcType=INTEGER}, #{variation1, jdbcType=DOUBLE}, #{variation2, jdbcType=DOUBLE}, #{variation3, jdbcType=DOUBLE}, + #{personId, jdbcType=INTEGER}, #{variation1, jdbcType=DOUBLE}, #{variation2, jdbcType=DOUBLE}, + #{variation3, jdbcType=DOUBLE}, #{variation4, jdbcType=DOUBLE}, #{variation5, jdbcType=DOUBLE}, #{dataValue, jdbcType=BINARY} ) diff --git a/sonar-core/src/main/resources/org/sonar/core/metric/db/MetricMapper.xml b/sonar-db/src/main/resources/org/sonar/db/metric/MetricMapper.xml similarity index 88% rename from sonar-core/src/main/resources/org/sonar/core/metric/db/MetricMapper.xml rename to sonar-db/src/main/resources/org/sonar/db/metric/MetricMapper.xml index f11d214d376..ca4a79a3a82 100644 --- a/sonar-core/src/main/resources/org/sonar/core/metric/db/MetricMapper.xml +++ b/sonar-db/src/main/resources/org/sonar/db/metric/MetricMapper.xml @@ -1,7 +1,7 @@ - + m.id, @@ -21,7 +21,7 @@ m.delete_historical_data as deleteHistoricalData - SELECT FROM metrics m @@ -30,7 +30,7 @@ - SELECT FROM metrics m @@ -48,7 +48,7 @@ ORDER BY UPPER(m.short_name), m.short_name - select from metrics m @@ -75,7 +75,7 @@ - INSERT INTO metrics ( name, description, direction, domain, short_name, qualitative, val_type, user_managed, enabled, worst_value, @@ -89,7 +89,7 @@ ) - + update metrics set name=#{key, jdbcType=VARCHAR}, @@ -128,7 +128,7 @@ where name=#{key} - SELECT FROM metrics m @@ -140,7 +140,7 @@ - SELECT FROM metrics m @@ -152,7 +152,7 @@ - SELECT FROM metrics m diff --git a/sonar-core/src/main/resources/org/sonar/core/notification/db/NotificationQueueMapper.xml b/sonar-db/src/main/resources/org/sonar/db/notification/NotificationQueueMapper.xml similarity index 73% rename from sonar-core/src/main/resources/org/sonar/core/notification/db/NotificationQueueMapper.xml rename to sonar-db/src/main/resources/org/sonar/db/notification/NotificationQueueMapper.xml index d1dbc9b0875..c09eafc31d0 100644 --- a/sonar-core/src/main/resources/org/sonar/core/notification/db/NotificationQueueMapper.xml +++ b/sonar-db/src/main/resources/org/sonar/db/notification/NotificationQueueMapper.xml @@ -2,22 +2,22 @@ - + - + INSERT INTO notifications (data) VALUES (#{data}) - + delete from notifications where id=#{id} - select count(*) from notifications - select id, data from notifications order by id asc @@ -25,18 +25,18 @@ - select top (#{count}) id, data from notifications order by id asc - select * from (select - id, data - from notifications - order by id asc + id, data + from notifications + order by id asc ) where rownum <= #{count} diff --git a/sonar-core/src/main/resources/org/sonar/core/permission/PermissionMapper.xml b/sonar-db/src/main/resources/org/sonar/db/permission/PermissionMapper.xml similarity index 93% rename from sonar-core/src/main/resources/org/sonar/core/permission/PermissionMapper.xml rename to sonar-db/src/main/resources/org/sonar/db/permission/PermissionMapper.xml index efb946a92c3..79a705a44dc 100644 --- a/sonar-core/src/main/resources/org/sonar/core/permission/PermissionMapper.xml +++ b/sonar-db/src/main/resources/org/sonar/db/permission/PermissionMapper.xml @@ -1,13 +1,13 @@ - + - SELECT id, name, kee, description, key_pattern AS keyPattern, created_at AS createdAt, updated_at AS updatedAt FROM permission_templates WHERE kee = #{kee} - SELECT id, name, kee, description, key_pattern AS keyPattern, created_at AS createdAt, updated_at AS updatedAt FROM permission_templates - + SELECT pt.id AS template_id, + pt.name AS template_name, + pt.description AS template_description, + pt.key_pattern AS template_key_pattern, + pt.created_at AS template_created_at, + pt.updated_at AS template_updated_at, + ptu.id AS permission_template_user_id, + ptu.permission_reference AS user_permission, + ptu.user_id AS user_id, + u.name AS user_name, + u.login AS user_login FROM permission_templates pt INNER JOIN perm_templates_users ptu ON ptu.template_id = pt.id INNER JOIN users u ON u.id = ptu.user_id AND u.active = ${_true} WHERE pt.kee = #{templateKey} - + SELECT pt.id AS template_id, + pt.name AS template_name, + pt.description AS template_description, + pt.key_pattern AS template_key_pattern, + pt.created_at AS template_created_at, + pt.updated_at AS template_updated_at, + ptg.id AS permission_template_group_id, + ptg.permission_reference AS group_permission, + ptg.group_id AS group_id, + g.name AS group_name FROM permission_templates pt INNER JOIN perm_templates_groups ptg ON ptg.template_id = pt.id LEFT OUTER JOIN groups g ON g.id = ptg.group_id diff --git a/sonar-core/src/main/resources/org/sonar/core/properties/PropertiesMapper.xml b/sonar-db/src/main/resources/org/sonar/db/property/PropertiesMapper.xml similarity index 95% rename from sonar-core/src/main/resources/org/sonar/core/properties/PropertiesMapper.xml rename to sonar-db/src/main/resources/org/sonar/db/property/PropertiesMapper.xml index 18297848cd6..d36c205772c 100644 --- a/sonar-core/src/main/resources/org/sonar/core/properties/PropertiesMapper.xml +++ b/sonar-db/src/main/resources/org/sonar/db/property/PropertiesMapper.xml @@ -1,7 +1,7 @@ - + diff --git a/sonar-core/src/main/resources/org/sonar/core/purge/PurgeMapper.xml b/sonar-db/src/main/resources/org/sonar/db/purge/PurgeMapper.xml similarity index 99% rename from sonar-core/src/main/resources/org/sonar/core/purge/PurgeMapper.xml rename to sonar-db/src/main/resources/org/sonar/db/purge/PurgeMapper.xml index de41b816f28..1d6bed47806 100644 --- a/sonar-core/src/main/resources/org/sonar/core/purge/PurgeMapper.xml +++ b/sonar-db/src/main/resources/org/sonar/db/purge/PurgeMapper.xml @@ -1,7 +1,7 @@ - + SELECT proj.id as id, proj.name as name, prop.text_value as gateId @@ -9,7 +9,8 @@ JOIN resource_index ind ON ind.root_project_id=proj.id - LEFT JOIN properties prop ON prop.resource_id=proj.id AND prop.prop_key='sonar.qualitygate' AND prop.text_value LIKE #{gateId} + LEFT JOIN properties prop ON prop.resource_id=proj.id AND prop.prop_key='sonar.qualitygate' AND prop.text_value LIKE + #{gateId} diff --git a/sonar-core/src/main/resources/org/sonar/core/qualitygate/db/QualityGateConditionMapper.xml b/sonar-db/src/main/resources/org/sonar/db/qualitygate/QualityGateConditionMapper.xml similarity index 59% rename from sonar-core/src/main/resources/org/sonar/core/qualitygate/db/QualityGateConditionMapper.xml rename to sonar-db/src/main/resources/org/sonar/db/qualitygate/QualityGateConditionMapper.xml index d4170d89d0f..0923db5ae60 100644 --- a/sonar-core/src/main/resources/org/sonar/core/qualitygate/db/QualityGateConditionMapper.xml +++ b/sonar-db/src/main/resources/org/sonar/db/qualitygate/QualityGateConditionMapper.xml @@ -1,32 +1,39 @@ - + - - insert into quality_gate_conditions (qgate_id, metric_id, operator, value_error, value_warning, period, created_at, updated_at) - values (#{qualityGateId}, #{metricId}, #{operator}, #{errorThreshold}, #{warningThreshold}, #{period}, #{createdAt}, #{updatedAt}) + + insert into quality_gate_conditions (qgate_id, metric_id, operator, value_error, value_warning, period, created_at, + updated_at) + values (#{qualityGateId}, #{metricId}, #{operator}, #{errorThreshold}, #{warningThreshold}, #{period}, #{createdAt}, + #{updatedAt}) - id, qgate_id as qualityGateId, metric_id as metricId, operator, value_warning as warningThreshold, value_error as errorThreshold, period, - created_at as createdAt, updated_at as updatedAt + id, qgate_id as qualityGateId, metric_id as metricId, operator, value_warning as warningThreshold, value_error as + errorThreshold, period, + created_at as createdAt, updated_at as updatedAt - + delete from quality_gate_conditions where id=#{id} - + update quality_gate_conditions set metric_id=#{metricId}, operator=#{operator}, @@ -37,7 +44,7 @@ where id=#{id} - + delete from quality_gate_conditions where metric_id not in (select id from metrics where enabled=${_true}) diff --git a/sonar-core/src/main/resources/org/sonar/core/qualitygate/db/QualityGateMapper.xml b/sonar-db/src/main/resources/org/sonar/db/qualitygate/QualityGateMapper.xml similarity index 69% rename from sonar-core/src/main/resources/org/sonar/core/qualitygate/db/QualityGateMapper.xml rename to sonar-db/src/main/resources/org/sonar/db/qualitygate/QualityGateMapper.xml index f54a4a8414b..64d2e58efb4 100644 --- a/sonar-core/src/main/resources/org/sonar/core/qualitygate/db/QualityGateMapper.xml +++ b/sonar-db/src/main/resources/org/sonar/db/qualitygate/QualityGateMapper.xml @@ -1,9 +1,9 @@ - + - + insert into quality_gates (name, created_at, updated_at) values (#{name}, #{createdAt}, #{updatedAt}) @@ -13,25 +13,31 @@ - + delete from quality_gates where id=#{id} - + update quality_gates set name=#{name}, updated_at=#{updatedAt} diff --git a/sonar-core/src/main/resources/org/sonar/core/qualityprofile/db/ActiveRuleMapper.xml b/sonar-db/src/main/resources/org/sonar/db/qualityprofile/ActiveRuleMapper.xml similarity index 97% rename from sonar-core/src/main/resources/org/sonar/core/qualityprofile/db/ActiveRuleMapper.xml rename to sonar-db/src/main/resources/org/sonar/db/qualityprofile/ActiveRuleMapper.xml index 0775c410de8..23ac091ce8a 100644 --- a/sonar-core/src/main/resources/org/sonar/core/qualityprofile/db/ActiveRuleMapper.xml +++ b/sonar-db/src/main/resources/org/sonar/db/qualityprofile/ActiveRuleMapper.xml @@ -1,7 +1,7 @@ - + a.id, @@ -36,7 +36,8 @@ LEFT JOIN rules_profiles qp ON qp.id=a.profile_id LEFT JOIN rules_profiles profile_parent ON profile_parent.kee=qp.parent_kee - LEFT JOIN active_rules active_rule_parent ON active_rule_parent.profile_id=profile_parent.id AND a.rule_id=active_rule_parent.rule_id + LEFT JOIN active_rules active_rule_parent ON active_rule_parent.profile_id=profile_parent.id AND + a.rule_id=active_rule_parent.rule_id - SELECT + SELECT + FROM rules_profiles p ORDER BY p.name, p.language - SELECT pp.id as id, pj.id as projectId, pj.uuid as projectUuid, pj.name as projectName, pp.profile_key as profileKey FROM projects pj JOIN project_qprofiles pp ON pp.project_uuid = pj.uuid - AND pp.profile_key = #{profileKey} + AND pp.profile_key = #{profileKey} AND pj.scope='PRJ' AND pj.qualifier='TRK' AND UPPER(pj.name) LIKE #{nameQuery} @@ -115,11 +124,11 @@ ORDER BY pj.name ASC - SELECT pp.id as id, pj.id as projectId, pj.uuid as projectUuid, pj.name as projectName, pp.profile_key as profileKey FROM projects pj LEFT JOIN project_qprofiles pp ON pp.project_uuid = pj.uuid - AND pp.profile_key = #{profileKey} + AND pp.profile_key = #{profileKey} AND pj.scope='PRJ' AND pj.qualifier='TRK' AND UPPER(pj.name) LIKE #{nameQuery} @@ -128,11 +137,11 @@ ORDER BY pj.name ASC - SELECT pp.id as id, pj.id as projectId, pj.uuid as projectUuid, pj.name as projectName, pp.profile_key as profileKey FROM projects pj LEFT JOIN project_qprofiles pp ON pp.project_uuid = pj.uuid - AND pp.profile_key = #{profileKey} + AND pp.profile_key = #{profileKey} AND pj.scope='PRJ' AND pj.qualifier='TRK' AND UPPER(pj.name) LIKE #{nameQuery} @@ -151,7 +160,7 @@ - SELECT pp.profile_key as profileKey, count(projects.id) as projectCount FROM projects projects INNER JOIN project_qprofiles pp ON pp.project_uuid=projects.uuid @@ -161,20 +170,22 @@ diff --git a/sonar-core/src/main/resources/org/sonar/core/rule/RuleMapper.xml b/sonar-db/src/main/resources/org/sonar/db/rule/RuleMapper.xml similarity index 93% rename from sonar-core/src/main/resources/org/sonar/core/rule/RuleMapper.xml rename to sonar-db/src/main/resources/org/sonar/db/rule/RuleMapper.xml index ce3320f987d..fd93ba7b0a5 100644 --- a/sonar-core/src/main/resources/org/sonar/core/rule/RuleMapper.xml +++ b/sonar-db/src/main/resources/org/sonar/db/rule/RuleMapper.xml @@ -1,7 +1,7 @@ - + r.id, @@ -146,10 +146,15 @@ insert into rules - values (#{ruleKey,jdbcType=VARCHAR}, #{repositoryKey,jdbcType=VARCHAR}, #{description,jdbcType=CLOB}, #{descriptionFormat,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{configKey,jdbcType=VARCHAR}, - #{severity,jdbcType=INTEGER}, #{isTemplate,jdbcType=BOOLEAN}, #{language,jdbcType=VARCHAR}, #{templateId,jdbcType=INTEGER}, - #{subCharacteristicId,jdbcType=INTEGER}, #{defaultSubCharacteristicId,jdbcType=INTEGER}, #{remediationFunction,jdbcType=VARCHAR}, #{defaultRemediationFunction,jdbcType=VARCHAR}, - #{remediationCoefficient,jdbcType=VARCHAR}, #{defaultRemediationCoefficient,jdbcType=VARCHAR}, #{remediationOffset,jdbcType=VARCHAR}, #{defaultRemediationOffset,jdbcType=VARCHAR}, + values (#{ruleKey,jdbcType=VARCHAR}, #{repositoryKey,jdbcType=VARCHAR}, #{description,jdbcType=CLOB}, + #{descriptionFormat,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, + #{configKey,jdbcType=VARCHAR}, + #{severity,jdbcType=INTEGER}, #{isTemplate,jdbcType=BOOLEAN}, #{language,jdbcType=VARCHAR}, + #{templateId,jdbcType=INTEGER}, + #{subCharacteristicId,jdbcType=INTEGER}, #{defaultSubCharacteristicId,jdbcType=INTEGER}, + #{remediationFunction,jdbcType=VARCHAR}, #{defaultRemediationFunction,jdbcType=VARCHAR}, + #{remediationCoefficient,jdbcType=VARCHAR}, #{defaultRemediationCoefficient,jdbcType=VARCHAR}, + #{remediationOffset,jdbcType=VARCHAR}, #{defaultRemediationOffset,jdbcType=VARCHAR}, #{effortToFixDescription}, #{tagsField}, #{systemTagsField}, #{noteData}, #{noteUserLogin}, #{noteCreatedAt}, #{noteUpdatedAt,jdbcType=TIMESTAMP}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}) diff --git a/sonar-core/src/main/resources/org/sonar/core/persistence/SemaphoreMapper.xml b/sonar-db/src/main/resources/org/sonar/db/semaphore/SemaphoreMapper.xml similarity index 84% rename from sonar-core/src/main/resources/org/sonar/core/persistence/SemaphoreMapper.xml rename to sonar-db/src/main/resources/org/sonar/db/semaphore/SemaphoreMapper.xml index 4c42b26ea17..5d1c1028478 100644 --- a/sonar-core/src/main/resources/org/sonar/core/persistence/SemaphoreMapper.xml +++ b/sonar-db/src/main/resources/org/sonar/db/semaphore/SemaphoreMapper.xml @@ -1,9 +1,9 @@ - + - + INSERT INTO semaphores (name, checksum, created_at, updated_at, locked_at) VALUES (#{name}, #{checksum}, #{createdAt}, #{updatedAt}, #{lockedAt}) @@ -17,16 +17,16 @@ - + delete from semaphores where name=#{id} - select s.id, s.name as name, s.locked_at as lockedAt, s.created_at as createdAt, s.updated_at as updatedAt from semaphores s where s.name=#{name} - + update semaphores set updated_at = #{now} where name=#{name} diff --git a/sonar-core/src/main/resources/org/sonar/core/source/db/FileSourceMapper.xml b/sonar-db/src/main/resources/org/sonar/db/source/FileSourceMapper.xml similarity index 63% rename from sonar-core/src/main/resources/org/sonar/core/source/db/FileSourceMapper.xml rename to sonar-db/src/main/resources/org/sonar/db/source/FileSourceMapper.xml index 290ab9f2d31..dd6a83ed5ff 100644 --- a/sonar-core/src/main/resources/org/sonar/core/source/db/FileSourceMapper.xml +++ b/sonar-db/src/main/resources/org/sonar/db/source/FileSourceMapper.xml @@ -2,43 +2,46 @@ - + - SELECT id, project_uuid as projectUuid, file_uuid as fileUuid, created_at as createdAt, updated_at as updatedAt, - binary_data as binaryData, line_hashes as lineHashes, data_hash as dataHash, src_hash as srcHash, data_type as dataType + binary_data as binaryData, line_hashes as lineHashes, data_hash as dataHash, src_hash as srcHash, data_type as + dataType FROM file_sources WHERE file_uuid = #{fileUuid} and data_type = #{dataType} - SELECT id, file_uuid as fileUuid, data_hash as dataHash, src_hash as srcHash, updated_at as updatedAt FROM file_sources WHERE project_uuid = #{projectUuid} and data_type=#{dataType} - - INSERT INTO file_sources (project_uuid, file_uuid, created_at, updated_at, binary_data, line_hashes, data_hash, src_hash, data_type) + + INSERT INTO file_sources (project_uuid, file_uuid, created_at, updated_at, binary_data, line_hashes, data_hash, + src_hash, data_type) VALUES (#{projectUuid,jdbcType=VARCHAR}, #{fileUuid,jdbcType=VARCHAR}, #{createdAt,jdbcType=BIGINT}, #{updatedAt,jdbcType=BIGINT}, #{binaryData,jdbcType=BLOB}, #{lineHashes,jdbcType=CLOB}, #{dataHash,jdbcType=VARCHAR}, #{srcHash,jdbcType=VARCHAR},#{dataType,jdbcType=VARCHAR}) - + UPDATE file_sources SET - updated_at = #{updatedAt,jdbcType=BIGINT}, - binary_data = #{binaryData,jdbcType=BLOB}, - line_hashes = #{lineHashes,jdbcType=CLOB}, - data_hash = #{dataHash,jdbcType=VARCHAR}, - src_hash = #{srcHash,jdbcType=VARCHAR} + updated_at = #{updatedAt,jdbcType=BIGINT}, + binary_data = #{binaryData,jdbcType=BLOB}, + line_hashes = #{lineHashes,jdbcType=CLOB}, + data_hash = #{dataHash,jdbcType=VARCHAR}, + src_hash = #{srcHash,jdbcType=VARCHAR} WHERE id = #{id} - + UPDATE file_sources SET updated_at = #{date,jdbcType=BIGINT} WHERE project_uuid = #{projectUuid} - AND updated_at = 0 + AND updated_at = 0 diff --git a/sonar-core/src/main/resources/org/sonar/core/source/db/SnapshotDataMapper.xml b/sonar-db/src/main/resources/org/sonar/db/source/SnapshotDataMapper.xml similarity index 82% rename from sonar-core/src/main/resources/org/sonar/core/source/db/SnapshotDataMapper.xml rename to sonar-db/src/main/resources/org/sonar/db/source/SnapshotDataMapper.xml index 2d380360fe8..022381e4df8 100644 --- a/sonar-core/src/main/resources/org/sonar/core/source/db/SnapshotDataMapper.xml +++ b/sonar-db/src/main/resources/org/sonar/db/source/SnapshotDataMapper.xml @@ -1,7 +1,7 @@ - + snapshot_id AS "snapshotId", @@ -10,7 +10,8 @@ + - SELECT count(id) FROM authors WHERE person_id=#{id} - + INSERT INTO authors (person_id, login, created_at, updated_at) VALUES (#{personId}, #{login}, #{createdAt}, #{updatedAt}) diff --git a/sonar-core/src/main/resources/org/sonar/core/user/AuthorizationMapper.xml b/sonar-db/src/main/resources/org/sonar/db/user/AuthorizationMapper.xml similarity index 79% rename from sonar-core/src/main/resources/org/sonar/core/user/AuthorizationMapper.xml rename to sonar-db/src/main/resources/org/sonar/db/user/AuthorizationMapper.xml index 52601598415..f33a7ae0640 100644 --- a/sonar-core/src/main/resources/org/sonar/core/user/AuthorizationMapper.xml +++ b/sonar-db/src/main/resources/org/sonar/db/user/AuthorizationMapper.xml @@ -1,34 +1,40 @@ - + @@ -71,7 +83,8 @@ INNER JOIN projects p on p.id = gr.resource_id AND p.module_uuid IS NULL and gr.role=#{role} - and (gr.group_id is null or gr.group_id in (select gu.group_id from groups_users gu where gu.user_id=#{userId})) + and (gr.group_id is null or gr.group_id in (select gu.group_id from groups_users gu where + gu.user_id=#{userId})) UNION SELECT p.kee as root_project_kee @@ -102,7 +115,8 @@ INNER JOIN projects p on p.id = gr.resource_id AND p.module_uuid IS NULL and gr.role=#{role} - and (gr.group_id is null or gr.group_id in (select gu.group_id from groups_users gu where gu.user_id=#{userId})) + and (gr.group_id is null or gr.group_id in (select gu.group_id from groups_users gu where + gu.user_id=#{userId})) UNION SELECT p.uuid as root_project_uuid @@ -134,7 +148,8 @@ INNER JOIN projects p on p.id = gr.resource_id AND p.module_uuid IS NULL and gr.role=#{role} - and (gr.group_id is null or gr.group_id in (select gu.group_id from groups_users gu where gu.user_id=#{userId})) + and (gr.group_id is null or gr.group_id in (select gu.group_id from groups_users gu where + gu.user_id=#{userId})) UNION SELECT p.id as root_project_id diff --git a/sonar-core/src/main/resources/org/sonar/core/user/GroupMapper.xml b/sonar-db/src/main/resources/org/sonar/db/user/GroupMapper.xml similarity index 83% rename from sonar-core/src/main/resources/org/sonar/core/user/GroupMapper.xml rename to sonar-db/src/main/resources/org/sonar/db/user/GroupMapper.xml index 2f7cc2d3f16..0991bcffc0b 100644 --- a/sonar-core/src/main/resources/org/sonar/core/user/GroupMapper.xml +++ b/sonar-db/src/main/resources/org/sonar/db/user/GroupMapper.xml @@ -2,7 +2,7 @@ - + g.id as id, @@ -13,7 +13,8 @@ - SELECT + SELECT + FROM groups g INNER JOIN groups_users gu on gu.group_id=g.id INNER JOIN users u on u.id=gu.user_id @@ -52,14 +55,15 @@ UPDATE groups SET - name=#{name}, - description=#{description}, - updated_at=#{updatedAt} + name=#{name}, + description=#{description}, + updated_at=#{updatedAt} WHERE id=#{id} SELECT g.id as id, g.name as name, g.description as description, gu.user_id as userId - + ORDER BY g.name - SELECT g.name as groupName, count(gu.user_id) as userCount FROM groups g LEFT JOIN groups_users gu ON gu.group_id=g.id - g.id in - - #{id} - - + g.id in + + #{id} + + GROUP BY g.name - SELECT u.login as login, g.name as groupName FROM users u LEFT JOIN groups_users gu ON gu.user_id=u.id @@ -71,21 +71,22 @@ - AND ((UPPER(u.login) LIKE #{query.memberSearchSql} ESCAPE '/') OR (UPPER(u.name) LIKE #{query.memberSearchSql} ESCAPE '/')) + AND ((UPPER(u.login) LIKE #{query.memberSearchSql} ESCAPE '/') OR (UPPER(u.name) LIKE #{query.memberSearchSql} + ESCAPE '/')) AND u.active=${_true} - SELECT u.id as id, u.login as login, u.name as name, gu.group_id as groupId - + ORDER BY u.name ASC diff --git a/sonar-core/src/main/resources/org/sonar/core/user/RoleMapper.xml b/sonar-db/src/main/resources/org/sonar/db/user/RoleMapper.xml similarity index 95% rename from sonar-core/src/main/resources/org/sonar/core/user/RoleMapper.xml rename to sonar-db/src/main/resources/org/sonar/db/user/RoleMapper.xml index 5cc000c61f6..41303206013 100644 --- a/sonar-core/src/main/resources/org/sonar/core/user/RoleMapper.xml +++ b/sonar-db/src/main/resources/org/sonar/db/user/RoleMapper.xml @@ -1,7 +1,7 @@ - + - + INSERT INTO group_roles (group_id, resource_id, role) VALUES (#{groupId}, #{resourceId}, #{role}) - + INSERT INTO user_roles (user_id, resource_id, role) VALUES (#{userId}, #{resourceId}, #{role}) diff --git a/sonar-core/src/main/resources/org/sonar/core/user/UserGroupMapper.xml b/sonar-db/src/main/resources/org/sonar/db/user/UserGroupMapper.xml similarity index 79% rename from sonar-core/src/main/resources/org/sonar/core/user/UserGroupMapper.xml rename to sonar-db/src/main/resources/org/sonar/db/user/UserGroupMapper.xml index 8b6b828ec95..d2177b452c0 100644 --- a/sonar-core/src/main/resources/org/sonar/core/user/UserGroupMapper.xml +++ b/sonar-db/src/main/resources/org/sonar/db/user/UserGroupMapper.xml @@ -1,7 +1,7 @@ - + INSERT INTO groups_users (user_id, group_id) @@ -11,15 +11,15 @@ DELETE FROM groups_users - AND user_id = #{userId} - AND group_id = #{groupId} + AND user_id = #{userId} + AND group_id = #{groupId} DELETE FROM groups_users - AND group_id = #{groupId} + AND group_id = #{groupId} diff --git a/sonar-core/src/main/resources/org/sonar/core/user/UserMapper.xml b/sonar-db/src/main/resources/org/sonar/db/user/UserMapper.xml similarity index 89% rename from sonar-core/src/main/resources/org/sonar/core/user/UserMapper.xml rename to sonar-db/src/main/resources/org/sonar/db/user/UserMapper.xml index aab09322e5d..d46d44f2eaa 100644 --- a/sonar-core/src/main/resources/org/sonar/core/user/UserMapper.xml +++ b/sonar-db/src/main/resources/org/sonar/db/user/UserMapper.xml @@ -1,7 +1,7 @@ - + u.id as id, @@ -124,13 +124,17 @@ INSERT INTO users (login, name, email, active, scm_accounts, salt, crypted_password, created_at, updated_at) - VALUES (#{login,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, #{active,jdbcType=BOOLEAN}, #{scmAccounts,jdbcType=VARCHAR}, - #{salt,jdbcType=VARCHAR}, #{cryptedPassword,jdbcType=VARCHAR}, #{createdAt,jdbcType=BIGINT}, #{updatedAt,jdbcType=BIGINT}) + VALUES (#{login,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, #{active,jdbcType=BOOLEAN}, + #{scmAccounts,jdbcType=VARCHAR}, + #{salt,jdbcType=VARCHAR}, #{cryptedPassword,jdbcType=VARCHAR}, #{createdAt,jdbcType=BIGINT}, + #{updatedAt,jdbcType=BIGINT}) - UPDATE users set name=#{name,jdbcType=VARCHAR}, email=#{email,jdbcType=VARCHAR}, active=#{active,jdbcType=BOOLEAN}, scm_accounts=#{scmAccounts,jdbcType=VARCHAR}, - salt=#{salt,jdbcType=VARCHAR}, crypted_password=#{cryptedPassword,jdbcType=BIGINT}, updated_at=#{updatedAt,jdbcType=BIGINT} + UPDATE users set name=#{name,jdbcType=VARCHAR}, email=#{email,jdbcType=VARCHAR}, active=#{active,jdbcType=BOOLEAN}, + scm_accounts=#{scmAccounts,jdbcType=VARCHAR}, + salt=#{salt,jdbcType=VARCHAR}, crypted_password=#{cryptedPassword,jdbcType=BIGINT}, + updated_at=#{updatedAt,jdbcType=BIGINT} WHERE login = #{login} diff --git a/sonar-core/src/main/resources/org/sonar/core/persistence/SchemaMigrationMapper.xml b/sonar-db/src/main/resources/org/sonar/db/version/SchemaMigrationMapper.xml similarity index 85% rename from sonar-core/src/main/resources/org/sonar/core/persistence/SchemaMigrationMapper.xml rename to sonar-db/src/main/resources/org/sonar/db/version/SchemaMigrationMapper.xml index 4f8e08eafc9..cde37378a00 100644 --- a/sonar-core/src/main/resources/org/sonar/core/persistence/SchemaMigrationMapper.xml +++ b/sonar-db/src/main/resources/org/sonar/db/version/SchemaMigrationMapper.xml @@ -1,7 +1,7 @@ - + + - select id, kee, name, language from rules_profiles where id=#{id} @@ -40,14 +40,14 @@ - select id, kee, name, language from rules_profiles @@ -68,7 +68,7 @@